You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/20 13:23:01 UTC
stratos git commit: eleminating NPE possibilities
Repository: stratos
Updated Branches:
refs/heads/master 0a5831989 -> 9991ffbdb
eleminating NPE possibilities
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9991ffbd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9991ffbd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9991ffbd
Branch: refs/heads/master
Commit: 9991ffbdba67308ba1ec62fe6cc9d5c0294e9913
Parents: 0a58319
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Mar 20 17:52:36 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Mar 20 17:52:36 2015 +0530
----------------------------------------------------------------------
.../util/converter/ObjectConverter.java | 128 +++++++++++++++++--
1 file changed, 114 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9991ffbd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index a3184ea..170e854 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -63,6 +63,10 @@ public class ObjectConverter {
public static CartridgeConfig convertCartridgeBeanToStubCartridgeConfig(
CartridgeBean cartridgeBean) {
+
+ if (cartridgeBean == null) {
+ return null;
+ }
CartridgeConfig cartridgeConfig = new CartridgeConfig();
@@ -110,6 +114,10 @@ public class ObjectConverter {
}
private static PortMapping[] convertPortMappingBeansToStubPortMappings(List<PortMappingBean> portMappingBeans) {
+
+ if (portMappingBeans == null) {
+ return null;
+ }
//convert to an array
PortMappingBean[] portMappingBeanArray = new PortMappingBean[portMappingBeans.size()];
@@ -128,6 +136,10 @@ public class ObjectConverter {
}
private static IaasConfig[] convertIaasProviderBeansToStubIaasConfig(List<IaasProviderBean> iaasProviderBeans) {
+
+ if (iaasProviderBeans == null) {
+ return null;
+ }
//convert to an array
IaasProviderBean[] iaasProviderBeansArray = new IaasProviderBean[iaasProviderBeans.size()];
@@ -162,6 +174,11 @@ public class ObjectConverter {
public static Persistence convertPersistenceBeanToStubPersistence(
org.apache.stratos.common.beans.cartridge.PersistenceBean persistenceBean) {
+
+ if (persistenceBean == null) {
+ return null;
+ }
+
Persistence persistence = new Persistence();
persistence.setPersistenceRequired(true);
VolumeBean[] volumeBean = new VolumeBean[persistenceBean.getVolume().size()];
@@ -189,6 +206,11 @@ public class ObjectConverter {
public static Properties convertPropertyBeansToProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
+
+ if (propertyBeans == null) {
+ return null;
+ }
+
org.apache.stratos.common.beans.cartridge.PropertyBean[] propertyBeansArray
= new org.apache.stratos.common.beans.cartridge.PropertyBean[propertyBeans.size()];
propertyBeans.toArray(propertyBeansArray);
@@ -208,6 +230,7 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.Properties convertPropertyBeansToCCStubProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
+
if (propertyBeans == null) {
return null;
}
@@ -235,6 +258,7 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.Properties convertProperyBeansToStubProperties(
List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -260,6 +284,11 @@ public class ObjectConverter {
private static NetworkInterfaces convertNetworkInterfaceBeansToNetworkInterfaces(
List<NetworkInterfaceBean> networkInterfaceBeans) {
+
+ if (networkInterfaceBeans == null) {
+ return null;
+ }
+
NetworkInterface[] networkInterfacesArray = new NetworkInterface[networkInterfaceBeans.size()];
int i = 0;
@@ -283,6 +312,10 @@ public class ObjectConverter {
private static FloatingNetworks convertFloatingNetworkBeansToFloatingNetworks(
List<FloatingNetworkBean> floatingNetworkBeans) {
+
+ if (floatingNetworkBeans == null) {
+ return null;
+ }
FloatingNetwork[] floatingNetworksArray = new FloatingNetwork[floatingNetworkBeans.size()];
@@ -302,6 +335,10 @@ public class ObjectConverter {
public static PartitionRef convertStubPartitionToPartitionRef
(PartitionRefBean partition) {
+
+ if (partition == null) {
+ return null;
+ }
org.apache.stratos.cloud.controller.stub.domain.PartitionRef stubPartition = new
org.apache.stratos.cloud.controller.stub.domain.PartitionRef();
@@ -314,6 +351,10 @@ public class ObjectConverter {
public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo(
AutoscalePolicyBean autoscalePolicyBean) {
+
+ if (autoscalePolicyBean == null) {
+ return null;
+ }
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = new
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy();
@@ -357,6 +398,10 @@ public class ObjectConverter {
public static org.apache.stratos.cloud.controller.stub.domain.DeploymentPolicy convetToCCDeploymentPolicy(
DeploymentPolicyBean deploymentPolicyBean) {
+
+ if (deploymentPolicyBean == null) {
+ return null;
+ }
org.apache.stratos.cloud.controller.stub.domain.DeploymentPolicy deploymentPolicy =
new org.apache.stratos.cloud.controller.stub.domain.DeploymentPolicy();
@@ -437,6 +482,10 @@ public class ObjectConverter {
}
public static Partition convertPartitionToCCPartitionPojo(PartitionBean partitionBean) {
+
+ if (partitionBean == null) {
+ return null;
+ }
Partition partition = new Partition();
partition.setId(partitionBean.getId());
@@ -452,6 +501,7 @@ public class ObjectConverter {
}
public static org.apache.stratos.autoscaler.stub.Properties getASProperties(List<PropertyBean> propertyBeans) {
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -476,6 +526,7 @@ public class ObjectConverter {
public static org.apache.stratos.autoscaler.stub.Properties getASPropertiesFromCommonProperties(
List<org.apache.stratos.common.beans.PropertyBean> propertyBeans) {
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -500,6 +551,7 @@ public class ObjectConverter {
}
public static org.apache.stratos.cloud.controller.stub.Properties getCCProperties(List<PropertyBean> propertyBeans) {
+
if (propertyBeans == null || propertyBeans.isEmpty()) {
return null;
}
@@ -524,6 +576,7 @@ public class ObjectConverter {
}
private static PartitionBean convertCCStubPartitionToPartition(Partition stubPartition) {
+
if (stubPartition == null) {
return null;
}
@@ -547,19 +600,6 @@ public class ObjectConverter {
}
- private static org.apache.stratos.common.beans.cartridge.PropertyBean convertStubPropertyToPropertyBean(
- org.apache.stratos.autoscaler.stub.Property stubProperty) {
- if ((stubProperty == null) || (!(stubProperty.getValue() instanceof String))) {
- return null;
- }
-
- org.apache.stratos.common.beans.cartridge.PropertyBean propertyBean
- = new org.apache.stratos.common.beans.cartridge.PropertyBean();
- propertyBean.setName(stubProperty.getName());
- propertyBean.setValue(String.valueOf(stubProperty.getValue()));
- return propertyBean;
- }
-
public static org.apache.stratos.cloud.controller.stub.domain.NetworkPartition convertNetworkPartitionToCCStubNetworkPartition(
NetworkPartitionBean networkPartitionBean) {
@@ -1365,6 +1405,10 @@ public class ObjectConverter {
private static CartridgeContext[] convertCartridgeReferenceBeansToStubCartridgeContexts(
List<CartridgeReferenceBean> cartridges) {
+
+ if (cartridges == null) {
+ return null;
+ }
CartridgeContext[] cartridgeContextArray = new CartridgeContext[cartridges.size()];
int i = 0;
@@ -1381,6 +1425,10 @@ public class ObjectConverter {
}
private static SubscribableInfoContext convertSubscribableInfo(SubscribableInfo subscribableInfo) {
+
+ if (subscribableInfo == null) {
+ return null;
+ }
SubscribableInfoContext infoContext = new SubscribableInfoContext();
infoContext.setAlias(subscribableInfo.getAlias());
@@ -1416,6 +1464,10 @@ public class ObjectConverter {
}
private static VolumeContext[] convertVolumeToStubVolume(List<VolumeBean> volumes) {
+
+ if (volumes == null) {
+ return null;
+ }
List<VolumeContext> volumeContexts = new ArrayList<VolumeContext>();
for(VolumeBean volumeBean: volumes){
@@ -1450,6 +1502,11 @@ public class ObjectConverter {
private static DependencyContext convertDependencyDefinitionsToDependencyContexts(DependencyBean dependencyDefinitions) {
+
+ if (dependencyDefinitions == null) {
+ return null;
+ }
+
DependencyContext dependencyContext = new DependencyContext();
dependencyContext.setTerminationBehaviour(dependencyDefinitions.getTerminationBehaviour());
@@ -1470,6 +1527,10 @@ public class ObjectConverter {
private static org.apache.stratos.autoscaler.stub.pojo.GroupContext[]
convertGroupDefinitionsToStubGroupContexts(List<GroupReferenceBean> groupDefinitions) {
+
+ if (groupDefinitions == null) {
+ return null;
+ }
GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()];
int i = 0;
@@ -1498,6 +1559,7 @@ public class ObjectConverter {
public static ApplicationInfoBean convertApplicationToApplicationBean(Application application) {
+
if (application == null) {
return null;
}
@@ -1513,6 +1575,7 @@ public class ObjectConverter {
}
public static ApplicationInfoBean convertApplicationToApplicationInstanceBean(Application application) {
+
if (application == null) {
return null;
}
@@ -1531,6 +1594,11 @@ public class ObjectConverter {
private static List<ApplicationInstanceBean> convertApplicationInstancesToApplicationInstances(
Application application) {
+
+ if (application == null) {
+ return null;
+ }
+
List<ApplicationInstanceBean> applicationInstanceList = new ArrayList<ApplicationInstanceBean>();
Collection<ApplicationInstance> applicationInstancesInTopology =
application.getInstanceIdToInstanceContextMap().values();
@@ -1588,6 +1656,11 @@ public class ObjectConverter {
}
private static List<InstanceBean> convertGroupInstancesToInstances(Group group) {
+
+ if (group == null) {
+ return null;
+ }
+
List<InstanceBean> instanceList = new ArrayList<InstanceBean>();
Collection<GroupInstance> instancesInTopology = group.getInstanceIdToInstanceContextMap().values();
if (instancesInTopology != null) {
@@ -1648,8 +1721,12 @@ public class ObjectConverter {
public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(GroupBean serviceGroupDefinition)
throws ServiceGroupDefinitionException {
+
+ if (serviceGroupDefinition == null) {
+ return null;
+ }
+
ServiceGroup servicegroup = new ServiceGroup();
-
// implement conversion (mostly List -> Array)
servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled());
List<GroupBean> groupsDef = serviceGroupDefinition.getGroups();
@@ -1770,6 +1847,10 @@ public class ObjectConverter {
}
public static ApplicationSignUp convertApplicationSignUpBeanToStubApplicationSignUp(ApplicationSignUpBean applicationSignUpBean) {
+
+ if (applicationSignUpBean == null) {
+ return null;
+ }
ApplicationSignUp applicationSignUp = new ApplicationSignUp();
if (applicationSignUpBean.getArtifactRepositories() != null) {
@@ -1793,6 +1874,10 @@ public class ObjectConverter {
}
public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(ApplicationSignUp applicationSignUp) {
+
+ if (applicationSignUp == null) {
+ return null;
+ }
ApplicationSignUpBean applicationSignUpBean = new ApplicationSignUpBean();
if (applicationSignUp.getArtifactRepositories() != null) {
@@ -1816,6 +1901,11 @@ public class ObjectConverter {
}
public static DomainMapping convertDomainMappingBeanToStubDomainMapping(DomainMappingBean domainMappingBean) {
+
+ if (domainMappingBean == null) {
+ return null;
+ }
+
DomainMapping domainMapping = new DomainMapping();
domainMapping.setDomainName(domainMappingBean.getDomainName());
domainMapping.setContextPath(domainMappingBean.getContextPath());
@@ -1823,6 +1913,11 @@ public class ObjectConverter {
}
public static DomainMappingBean convertStubDomainMappingToDomainMappingBean(DomainMapping domainMapping) {
+
+ if (domainMapping == null) {
+ return null;
+ }
+
DomainMappingBean domainMappingBean = new DomainMappingBean();
domainMappingBean.setDomainName(domainMapping.getDomainName());
domainMappingBean.setContextPath(domainMapping.getContextPath());
@@ -1830,6 +1925,11 @@ public class ObjectConverter {
}
public static DeploymentPolicyBean convetCCStubDeploymentPolicytoDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
+
+ if (deploymentPolicy == null) {
+ return null;
+ }
+
DeploymentPolicyBean deploymentPolicyBean = new DeploymentPolicyBean();
deploymentPolicyBean.setId(deploymentPolicy.getDeploymentPolicyID());
deploymentPolicyBean.setNetworkPartitions(convertCCStubNetwotkPartitionRefsToNetworkPartitionRefs(