Repository: stratos Updated Branches: refs/heads/master 388d20629 -> 5dd46dca1
Adding null conditions in rest api object conversion logic Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e039bd22 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e039bd22 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e039bd22 Branch: refs/heads/master Commit: e039bd22ab51c679283359f54ea1fc68f72474ca Parents: add606e Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 16 01:34:10 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 18 12:06:56 2014 +0530 ---------------------------------------------------------------------- .../endpoint/util/converter/PojoConverter.java | 40 +++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e039bd22/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java index a5eb791..2df88e6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java @@ -1122,17 +1122,19 @@ public class PojoConverter { private static List<GroupDefinition> convertGroupContextsToGroupDefinitions(GroupContext[] groupContexts) { List<GroupDefinition> groupDefinitions = new ArrayList<GroupDefinition>(); - for(GroupContext groupContext : groupContexts) { - GroupDefinition groupDefinition = new GroupDefinition(); - groupDefinition.setAlias(groupContext.getAlias()); - groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); - groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); - groupDefinition.setGroupScalingEnabled(groupContext.getGroupScalingEnabled()); - groupDefinition.setName(groupContext.getName()); - groupDefinition.setGroups(convertGroupContextsToGroupDefinitions(groupContext.getGroupContexts())); - groupDefinition.setCartridges(convertCartridgeContextsToCartridgeDefinitions( - groupContext.getCartridgeContexts())); - groupDefinitions.add(groupDefinition); + if(groupContexts != null) { + for (GroupContext groupContext : groupContexts) { + GroupDefinition groupDefinition = new GroupDefinition(); + groupDefinition.setAlias(groupContext.getAlias()); + groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); + groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); + groupDefinition.setGroupScalingEnabled(groupContext.getGroupScalingEnabled()); + groupDefinition.setName(groupContext.getName()); + groupDefinition.setGroups(convertGroupContextsToGroupDefinitions(groupContext.getGroupContexts())); + groupDefinition.setCartridges(convertCartridgeContextsToCartridgeDefinitions( + groupContext.getCartridgeContexts())); + groupDefinitions.add(groupDefinition); + } } return groupDefinitions; } @@ -1160,13 +1162,15 @@ public class PojoConverter { private static List<CartridgeDefinition> convertCartridgeContextsToCartridgeDefinitions(CartridgeContext[] cartridgeContexts) { List<CartridgeDefinition> cartridgeDefinitions = new ArrayList<CartridgeDefinition>(); - for(CartridgeContext cartridgeContext : cartridgeContexts) { - CartridgeDefinition cartridgeDefinition = new CartridgeDefinition(); - cartridgeDefinition.setType(cartridgeContext.getType()); - cartridgeDefinition.setCartridgeMin(cartridgeContext.getCartridgeMin()); - cartridgeDefinition.setCartridgeMax(cartridgeContext.getCartridgeMax()); - cartridgeDefinition.setSubscribableInfo(convertSubscribableInfoContextToSubscribableInfo(cartridgeContext.getSubscribableInfoContext())); - cartridgeDefinitions.add(cartridgeDefinition); + if(cartridgeContexts != null) { + for (CartridgeContext cartridgeContext : cartridgeContexts) { + CartridgeDefinition cartridgeDefinition = new CartridgeDefinition(); + cartridgeDefinition.setType(cartridgeContext.getType()); + cartridgeDefinition.setCartridgeMin(cartridgeContext.getCartridgeMin()); + cartridgeDefinition.setCartridgeMax(cartridgeContext.getCartridgeMax()); + cartridgeDefinition.setSubscribableInfo(convertSubscribableInfoContextToSubscribableInfo(cartridgeContext.getSubscribableInfoContext())); + cartridgeDefinitions.add(cartridgeDefinition); + } } return cartridgeDefinitions; }
