You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/15 21:04:21 UTC
stratos git commit: Adding null conditions in rest api object
conversion logic
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 0c66d6afd -> 476e794f4
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/476e794f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/476e794f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/476e794f
Branch: refs/heads/4.1.0-test
Commit: 476e794f41df590cf192638fd8b17c5aedff48fd
Parents: 0c66d6a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Dec 16 01:34:10 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Dec 16 01:34:10 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/476e794f/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;
}