ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-11-10 09:02:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

avoid null pointer exception

Browse source
This commit is contained in:
Mengyi Zhou 2016-11-04 11:06:44 +08:00
parent 1410c73ee8
commit 653c007e63
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/ctrip/zeus/restful/resource/GroupResource.java
View file

@ -301,7 +301,11 @@ public class GroupResource {
public Response add(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody,
@QueryParam("force") Boolean force) throws Exception {
ExtendedView.ExtendedGroup extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedGroup.class);
Group g = ObjectJsonParser.parse(requestBody, Group.class).setVirtual(null);
Group g = ObjectJsonParser.parse(requestBody, Group.class);
if (g == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to group.");
}
g.setVirtual(null);
trim(g);
Long checkId = groupCriteriaQuery.queryByName(g.getName());
@ -342,7 +346,11 @@ public class GroupResource {
public Response addVGroup(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody,
@QueryParam("force") Boolean force) throws Exception {
ExtendedView.ExtendedGroup extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedGroup.class);
Group g = ObjectJsonParser.parse(requestBody, Group.class).setVirtual(true);
Group g = ObjectJsonParser.parse(requestBody, Group.class);
if (g == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to virtual group.");
}
g.setVirtual(true);
trim(g);
Long checkId = groupCriteriaQuery.queryByName(g.getName());
@ -423,7 +431,11 @@ public class GroupResource {
public Response update(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody,
@QueryParam("force") Boolean force) throws Exception {
ExtendedView.ExtendedGroup extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedGroup.class);
Group g = ObjectJsonParser.parse(requestBody, Group.class).setVirtual(null);
Group g = ObjectJsonParser.parse(requestBody, Group.class);
if (g == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to group.");
}
g.setVirtual(null);
trim(g);
IdVersion[] check = groupCriteriaQuery.queryByIdAndMode(g.getId(), SelectionMode.OFFLINE_FIRST);
@ -472,7 +484,11 @@ public class GroupResource {
public Response updateVGroup(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody
, @QueryParam("force") Boolean force) throws Exception {
ExtendedView.ExtendedGroup extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedGroup.class);
Group g = ObjectJsonParser.parse(requestBody, Group.class).setVirtual(true);
Group g = ObjectJsonParser.parse(requestBody, Group.class);
if (g == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to virtual group.");
}
g.setVirtual(true);
trim(g);
DistLock lock = dbLockFactory.newLock(g.getId() + "_updateGroup");

6
src/main/java/com/ctrip/zeus/restful/resource/SlbResource.java
View file

@ -173,6 +173,9 @@ public class SlbResource {
public Response add(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody) throws Exception {
ExtendedView.ExtendedSlb extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedSlb.class);
Slb s = ObjectJsonParser.parse(requestBody, Slb.class);
if (s == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to slb.");
}
trim(s);
s = slbRepository.add(s);
@ -207,6 +210,9 @@ public class SlbResource {
public Response update(@Context HttpHeaders hh, @Context HttpServletRequest request, String requestBody) throws Exception {
ExtendedView.ExtendedSlb extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedSlb.class);
Slb s = ObjectJsonParser.parse(requestBody, Slb.class);
if (s == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to slb.");
}
trim(s);
IdVersion[] check = slbCriteriaQuery.queryByIdAndMode(s.getId(), SelectionMode.OFFLINE_FIRST);

6
src/main/java/com/ctrip/zeus/restful/resource/VirtualServerResource.java
View file

@ -179,6 +179,9 @@ public class VirtualServerResource {
@Context HttpServletRequest request, String requestBody) throws Exception {
ExtendedView.ExtendedVs extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedVs.class);
VirtualServer vs = ObjectJsonParser.parse(requestBody, VirtualServer.class);
if (vs == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to virtual server.");
}
trim(vs);
vs = virtualServerRepository.add(vs);
@ -233,6 +236,9 @@ public class VirtualServerResource {
@Context HttpServletRequest request, String requestBody) throws Exception {
ExtendedView.ExtendedVs extendedView = ObjectJsonParser.parse(requestBody, ExtendedView.ExtendedVs.class);
VirtualServer vs = ObjectJsonParser.parse(requestBody, VirtualServer.class);
if (vs == null) {
throw new ValidationException("Invalid post entity. Fail to parse json to virtual server.");
}
trim(vs);
IdVersion[] check = virtualServerCriteriaQuery.queryByIdAndMode(vs.getId(), SelectionMode.OFFLINE_FIRST);