You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/08/12 13:32:50 UTC
[27/50] [abbrv] stratos git commit: Cleaning and Formatting Code
Cleaning and Formatting Code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f105f333
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f105f333
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f105f333
Branch: refs/heads/data-publisher-integration
Commit: f105f333f948063c157ecbdef718bc6a596e7242
Parents: 6d1bfc5
Author: Thanuja <th...@wso2.com>
Authored: Fri Aug 7 17:46:29 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Fri Aug 7 17:46:29 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41.java | 36 ++++++---
.../rest/endpoint/api/StratosApiV41Utils.java | 49 +++++--------
.../util/converter/ObjectConverter.java | 77 +++++++++++++-------
3 files changed, 93 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index a16a3e5..581c8ab 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -445,7 +445,8 @@ public class StratosApiV41 extends AbstractApi {
.build();
} catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
}
}
@@ -480,10 +481,12 @@ public class StratosApiV41 extends AbstractApi {
ResponseMessageBean.ERROR, e.getMessage())).build();
} catch (AutoscalerServiceInvalidServiceGroupExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
} catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+ ResponseMessageBean.ERROR,
+ e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
}
}
@@ -1252,7 +1255,8 @@ public class StratosApiV41 extends AbstractApi {
}
StratosApiV41Utils.undeployApplication(applicationId, force);
return Response.accepted().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Application undeploy process started successfully: [application-id] %s", applicationId))).build();
+ String.format("Application undeploy process started successfully: [application-id] %s",
+ applicationId))).build();
}
/**
@@ -1305,7 +1309,8 @@ public class StratosApiV41 extends AbstractApi {
if (!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED)) {
return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
String.format("Could not delete since application is not in CREATED state :" +
- " [application] %s [current-status] %S", applicationId, applicationDefinition.getStatus()))).build();
+ " [application] %s [current-status] %S", applicationId,
+ applicationDefinition.getStatus()))).build();
}
StratosApiV41Utils.removeApplication(applicationId);
@@ -1501,10 +1506,12 @@ public class StratosApiV41 extends AbstractApi {
} catch (InvalidEmailException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid email: [email] %s", tenantInfoBean.getEmail()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid email: [email] %s",
+ tenantInfoBean.getEmail()))).build();
} catch (InvalidDomainException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid domain: [domain] %s", tenantInfoBean.getTenantDomain()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid domain: [domain] %s",
+ tenantInfoBean.getTenantDomain()))).build();
}
}
@@ -1527,16 +1534,19 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.updateExistingTenant(tenantInfoBean);
return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Tenant updated successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
+ String.format("Tenant updated successfully: [tenant] %s",
+ tenantInfoBean.getTenantDomain()))).build();
} catch (TenantNotFoundException ex) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Tenant not found")).build();
} catch (InvalidEmailException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid email [email] %s", tenantInfoBean.getEmail()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid email [email] %s",
+ tenantInfoBean.getEmail()))).build();
} catch (InvalidDomainException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, String.format("Invalid Domain [Domain] %s", tenantInfoBean.getTenantDomain()))).build();
+ ResponseMessageBean.ERROR, String.format("Invalid Domain [Domain] %s",
+ tenantInfoBean.getTenantDomain()))).build();
} catch (Exception e) {
String msg = "Error in updating tenant " + tenantInfoBean.getTenantDomain();
log.error(msg, e);
@@ -1643,13 +1653,15 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
try {
- List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = StratosApiV41Utils.searchPartialTenantsDomains(tenantDomain);
+ List<org.apache.stratos.common.beans.TenantInfoBean> tenantList =
+ StratosApiV41Utils.searchPartialTenantsDomains(tenantDomain);
if (tenantList == null || tenantList.isEmpty()) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "No tenants found")).build();
}
- return Response.ok().entity(tenantList.toArray(new org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
+ return Response.ok().entity(tenantList.toArray(
+ new org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
} catch (Exception e) {
String msg = "Error in getting information for tenant " + tenantDomain;
log.error(msg, e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 716076d..74397d4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -56,17 +56,16 @@ import org.apache.stratos.common.beans.topology.GroupInstanceBean;
import org.apache.stratos.common.client.AutoscalerServiceClient;
import org.apache.stratos.common.client.CloudControllerServiceClient;
import org.apache.stratos.common.client.StratosManagerServiceClient;
-import org.apache.stratos.common.exception.ApacheStratosException;
import org.apache.stratos.common.exception.InvalidEmailException;
import org.apache.stratos.common.util.ClaimsMgtUtil;
import org.apache.stratos.common.util.CommonUtil;
+import org.apache.stratos.kubernetes.client.KubernetesConstants;
import org.apache.stratos.manager.service.stub.StratosManagerServiceApplicationSignUpExceptionException;
import org.apache.stratos.manager.service.stub.StratosManagerServiceDomainMappingExceptionException;
import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository;
import org.apache.stratos.manager.service.stub.domain.application.signup.DomainMapping;
import org.apache.stratos.manager.user.management.StratosUserManagerUtils;
-import org.apache.stratos.manager.user.management.TenantUserRoleManager;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.messaging.domain.application.Application;
@@ -93,7 +92,6 @@ import org.wso2.carbon.user.api.UserStoreManager;
import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.apache.stratos.kubernetes.client.KubernetesConstants;
import java.rmi.RemoteException;
import java.util.*;
@@ -102,13 +100,13 @@ import java.util.regex.Pattern;
public class StratosApiV41Utils {
+ private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
+
public static final String APPLICATION_STATUS_DEPLOYED = "Deployed";
public static final String APPLICATION_STATUS_CREATED = "Created";
public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying";
public static final String KUBERNETES_IAAS_PROVIDER = "kubernetes";
- private static final Log log = LogFactory.getLog(StratosApiV41Utils.class);
-
/**
* Add New Cartridge
*
@@ -973,7 +971,6 @@ public class StratosApiV41Utils {
List<String> cartridgeTypes = new ArrayList<String>();
String[] cartridgeNames = null;
List<String> groupNames;
- String[] cartridgeGroupNames;
if (log.isDebugEnabled()) {
log.debug("Checking cartridges in cartridge group " + serviceGroupDefinition.getName());
@@ -1018,11 +1015,10 @@ public class StratosApiV41Utils {
List<CartridgeGroupBean> groupDefinitions = serviceGroupDefinition.getGroups();
groupNames = new ArrayList<String>();
- cartridgeGroupNames = new String[groupDefinitions.size()];
+
int i = 0;
for (CartridgeGroupBean groupList : groupDefinitions) {
groupNames.add(groupList.getName());
- cartridgeGroupNames[i] = groupList.getName();
i++;
}
@@ -1102,29 +1098,24 @@ public class StratosApiV41Utils {
List<String> cartridgesToRemove = new ArrayList<String>();
List<String> cartridgesToAdd = new ArrayList<String>();
- if (cartridgesBeforeUpdating != null) {
- if (!cartridgesBeforeUpdating.isEmpty()) {
- cartridgesToRemove.addAll(cartridgesBeforeUpdating);
- }
+
+ if (!cartridgesBeforeUpdating.isEmpty()) {
+ cartridgesToRemove.addAll(cartridgesBeforeUpdating);
}
- if (cartridgesAfterUpdating != null) {
- if (!cartridgesAfterUpdating.isEmpty()) {
- cartridgesToAdd.addAll(cartridgesAfterUpdating);
- }
+ if (!cartridgesAfterUpdating.isEmpty()) {
+ cartridgesToAdd.addAll(cartridgesAfterUpdating);
}
- if ((cartridgesBeforeUpdating != null) && (cartridgesAfterUpdating != null)) {
- if ((!cartridgesBeforeUpdating.isEmpty()) && (!cartridgesAfterUpdating.isEmpty())) {
- for (String before : cartridgesBeforeUpdating) {
- for (String after : cartridgesAfterUpdating) {
- if (before.toLowerCase().equals(after.toLowerCase())) {
- if (cartridgesToRemove.contains(after)) {
- cartridgesToRemove.remove(after);
- }
- if (cartridgesToAdd.contains(after)) {
- cartridgesToAdd.remove(after);
- }
+ if ((!cartridgesBeforeUpdating.isEmpty()) && (!cartridgesAfterUpdating.isEmpty())) {
+ for (String before : cartridgesBeforeUpdating) {
+ for (String after : cartridgesAfterUpdating) {
+ if (before.toLowerCase().equals(after.toLowerCase())) {
+ if (cartridgesToRemove.contains(after)) {
+ cartridgesToRemove.remove(after);
+ }
+ if (cartridgesToAdd.contains(after)) {
+ cartridgesToAdd.remove(after);
}
}
}
@@ -1941,10 +1932,6 @@ public class StratosApiV41Utils {
if (application.getInstanceContextCount() > 0
|| (applicationContext != null &&
applicationContext.getStatus().equals("Deployed"))) {
-
- if (application == null) {
- return null;
- }
applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application);
for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
addClustersInstancesToApplicationInstanceBean(instanceBean, application);
http://git-wip-us.apache.org/repos/asf/stratos/blob/f105f333/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 798882e..ac32305 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
@@ -288,7 +288,8 @@ public class ObjectConverter {
org.apache.stratos.cloud.controller.stub.Properties stubProperties
= new org.apache.stratos.cloud.controller.stub.Properties();
org.apache.stratos.cloud.controller.stub.Property[] stubPropertiesArray =
- stubPropertiesList.toArray(new org.apache.stratos.cloud.controller.stub.Property[stubPropertiesList.size()]);
+ stubPropertiesList.toArray(
+ new org.apache.stratos.cloud.controller.stub.Property[stubPropertiesList.size()]);
stubProperties.setProperties(stubPropertiesArray);
return stubProperties;
@@ -457,7 +458,8 @@ public class ObjectConverter {
networkPartition.setProvider(stubNetworkPartition.getProvider());
if (stubNetworkPartition.getPartitions() != null) {
List<PartitionBean> partitionList = new ArrayList<PartitionBean>();
- for (org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition : stubNetworkPartition.getPartitions()) {
+ for (org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition :
+ stubNetworkPartition.getPartitions()) {
if (stubPartition != null) {
partitionList.add(convertCCStubPartitionToPartition(stubPartition));
}
@@ -484,7 +486,8 @@ public class ObjectConverter {
return networkPartition;
}
- public static ApplicationPolicyBean convertASStubApplicationPolicyToApplicationPolicy(ApplicationPolicy applicationPolicy) {
+ public static ApplicationPolicyBean convertASStubApplicationPolicyToApplicationPolicy(
+ ApplicationPolicy applicationPolicy) {
if (applicationPolicy == null) {
return null;
@@ -498,7 +501,8 @@ public class ObjectConverter {
if (applicationPolicy.getProperties() != null) {
List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
= new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
- for (org.apache.stratos.autoscaler.stub.Property stubProperty : applicationPolicy.getProperties().getProperties()) {
+ for (org.apache.stratos.autoscaler.stub.Property stubProperty :
+ applicationPolicy.getProperties().getProperties()) {
if (stubProperty != null) {
org.apache.stratos.common.beans.PropertyBean propertyBean
= new org.apache.stratos.common.beans.PropertyBean();
@@ -555,7 +559,8 @@ public class ObjectConverter {
return properties;
}
- private static PartitionBean convertCCStubPartitionToPartition(org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition) {
+ private static PartitionBean convertCCStubPartitionToPartition(
+ org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition) {
if (stubPartition == null) {
return null;
@@ -793,7 +798,8 @@ public class ObjectConverter {
return partitionBeans;
}
- public static PartitionBean populatePartitionPojo(org.apache.stratos.cloud.controller.stub.domain.Partition partition) {
+ public static PartitionBean populatePartitionPojo(
+ org.apache.stratos.cloud.controller.stub.domain.Partition partition) {
PartitionBean partitionBeans = new PartitionBean();
if (partition == null) {
@@ -860,7 +866,8 @@ public class ObjectConverter {
autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName());
autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
if (autoscalePolicy.getLoadThresholds() != null) {
- autoscalePolicyBean.setLoadThresholds(convertStubLoadThresholdsToLoadThresholds(autoscalePolicy.getLoadThresholds()));
+ autoscalePolicyBean.setLoadThresholds(convertStubLoadThresholdsToLoadThresholds(
+ autoscalePolicy.getLoadThresholds()));
}
return autoscalePolicyBean;
@@ -1011,7 +1018,8 @@ public class ObjectConverter {
kubernetesClusterBean.setClusterId(kubernetesCluster.getClusterId());
kubernetesClusterBean.setDescription(kubernetesCluster.getDescription());
kubernetesClusterBean.setPortRange(convertStubPortRangeToPortRange(kubernetesCluster.getPortRange()));
- kubernetesClusterBean.setKubernetesHosts(convertStubKubernetesHostsToKubernetesHosts(kubernetesCluster.getKubernetesHosts()));
+ kubernetesClusterBean.setKubernetesHosts(convertStubKubernetesHostsToKubernetesHosts(
+ kubernetesCluster.getKubernetesHosts()));
kubernetesClusterBean.setKubernetesMaster(convertStubKubernetesMasterToKubernetesMaster(
kubernetesCluster.getKubernetesMaster()));
kubernetesClusterBean.setProperty(convertCCStubPropertiesToPropertyBeans(kubernetesCluster.getProperties()));
@@ -1038,7 +1046,8 @@ public class ObjectConverter {
return null;
}
List<KubernetesHostBean> kubernetesHostList = new ArrayList<KubernetesHostBean>();
- for (org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost : kubernetesHosts) {
+ for (org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost :
+ kubernetesHosts) {
kubernetesHostList.add(convertStubKubernetesHostToKubernetesHost(kubernetesHost));
}
return kubernetesHostList;
@@ -1119,12 +1128,14 @@ public class ObjectConverter {
// top level dependency information
if (applicationDefinition.getComponents().getDependencies() != null) {
componentContext.setDependencyContext(
- convertDependencyDefinitionsToDependencyContexts(applicationDefinition.getComponents().getDependencies()));
+ convertDependencyDefinitionsToDependencyContexts(applicationDefinition.getComponents().
+ getDependencies()));
}
// top level cartridge context information
if (applicationDefinition.getComponents().getCartridges() != null) {
componentContext.setCartridgeContexts(
- convertCartridgeReferenceBeansToStubCartridgeContexts(applicationDefinition.getComponents().getCartridges()));
+ convertCartridgeReferenceBeansToStubCartridgeContexts(applicationDefinition.getComponents().
+ getCartridges()));
}
applicationContext.setComponents(componentContext);
}
@@ -1151,23 +1162,27 @@ public class ObjectConverter {
// top level Groups
if (applicationContext.getComponents().getGroupContexts() != null) {
applicationDefinition.getComponents().setGroups(
- convertStubGroupContextsToGroupDefinitions(applicationContext.getComponents().getGroupContexts()));
+ convertStubGroupContextsToGroupDefinitions(applicationContext.getComponents().
+ getGroupContexts()));
}
// top level dependency information
if (applicationContext.getComponents().getDependencyContext() != null) {
applicationDefinition.getComponents().setDependencies(
- convertStubDependencyContextsToDependencyDefinitions(applicationContext.getComponents().getDependencyContext()));
+ convertStubDependencyContextsToDependencyDefinitions(applicationContext.getComponents().
+ getDependencyContext()));
}
// top level cartridge context information
if (applicationContext.getComponents().getCartridgeContexts() != null) {
applicationDefinition.getComponents().setCartridges(
- convertStubCartridgeContextsToCartridgeReferenceBeans(applicationContext.getComponents().getCartridgeContexts()));
+ convertStubCartridgeContextsToCartridgeReferenceBeans(applicationContext.getComponents().
+ getCartridgeContexts()));
}
}
return applicationDefinition;
}
- private static List<CartridgeGroupReferenceBean> convertStubGroupContextsToGroupDefinitions(GroupContext[] groupContexts) {
+ private static List<CartridgeGroupReferenceBean> convertStubGroupContextsToGroupDefinitions(
+ GroupContext[] groupContexts) {
List<CartridgeGroupReferenceBean> groupDefinitions = new ArrayList<CartridgeGroupReferenceBean>();
if (groupContexts != null) {
for (GroupContext groupContext : groupContexts) {
@@ -1177,7 +1192,8 @@ public class ObjectConverter {
groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances());
groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances());
groupDefinition.setName(groupContext.getName());
- groupDefinition.setGroups(convertStubGroupContextsToGroupDefinitions(groupContext.getGroupContexts()));
+ groupDefinition.setGroups(convertStubGroupContextsToGroupDefinitions(
+ groupContext.getGroupContexts()));
groupDefinition.setCartridges(convertStubCartridgeContextsToCartridgeReferenceBeans(
groupContext.getCartridgeContexts()));
groupDefinitions.add(groupDefinition);
@@ -1187,7 +1203,8 @@ public class ObjectConverter {
return groupDefinitions;
}
- private static DependencyBean convertStubDependencyContextsToDependencyDefinitions(DependencyContext dependencyContext) {
+ private static DependencyBean convertStubDependencyContextsToDependencyDefinitions(
+ DependencyContext dependencyContext) {
DependencyBean dependencyBean = new DependencyBean();
dependencyBean.setTerminationBehaviour(dependencyContext.getTerminationBehaviour());
@@ -1389,7 +1406,7 @@ public class ObjectConverter {
infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy());
infoContext.setMaxMembers(subscribableInfo.getMaxMembers());
infoContext.setMinMembers(subscribableInfo.getMinMembers());
- infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP());
+ infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP());
if (subscribableInfo.getArtifactRepository() != null) {
ArtifactRepositoryBean artifactRepository = subscribableInfo.getArtifactRepository();
@@ -1472,13 +1489,15 @@ public class ObjectConverter {
dependencyContext.setStartupOrdersContexts(startupOrders.toArray(new String[startupOrders.size()]));
}
if (dependencyBean.getScalingDependents() != null) {
- List<String> scalingDependents = convertScalingDependentsBeansToStringList(dependencyBean.getScalingDependents());
+ List<String> scalingDependents = convertScalingDependentsBeansToStringList(
+ dependencyBean.getScalingDependents());
dependencyContext.setScalingDependents(scalingDependents.toArray(new String[scalingDependents.size()]));
}
return dependencyContext;
}
- private static List<String> convertScalingDependentsBeansToStringList(List<ScalingDependentsBean> scalingDependentsBeans) {
+ private static List<String> convertScalingDependentsBeansToStringList(
+ List<ScalingDependentsBean> scalingDependentsBeans) {
List<String> scalingDependents = new ArrayList<String>();
if (scalingDependentsBeans != null) {
for (ScalingDependentsBean scalingDependentsBean : scalingDependentsBeans) {
@@ -1519,7 +1538,8 @@ public class ObjectConverter {
// Cartridges
if (groupDefinition.getCartridges() != null) {
- groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(groupDefinition.getCartridges()));
+ groupContext.setCartridgeContexts(convertCartridgeReferenceBeansToStubCartridgeContexts(
+ groupDefinition.getCartridges()));
}
groupContexts[i++] = groupContext;
}
@@ -1805,7 +1825,8 @@ public class ObjectConverter {
validateTerminationBehavior(dependencyBean.getTerminationBehaviour());
dependencies.setTerminationBehaviour(dependencyBean.getTerminationBehaviour());
if (dependencyBean.getScalingDependents() != null) {
- List<String> scalingDependents = convertScalingDependentsBeansToStringList(dependencyBean.getScalingDependents());
+ List<String> scalingDependents = convertScalingDependentsBeansToStringList(
+ dependencyBean.getScalingDependents());
dependencies.setScalingDependants(scalingDependents.toArray(new String[scalingDependents.size()]));
}
servicegroup.setDependencies(dependencies);
@@ -1920,7 +1941,8 @@ public class ObjectConverter {
return applicationSignUp;
}
- public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(ApplicationSignUp applicationSignUp) {
+ public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(
+ ApplicationSignUp applicationSignUp) {
if (applicationSignUp == null) {
return null;
@@ -1971,7 +1993,8 @@ public class ObjectConverter {
return domainMappingBean;
}
- public static DeploymentPolicyBean convertCCStubDeploymentPolicyToDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
+ public static DeploymentPolicyBean convertCCStubDeploymentPolicyToDeploymentPolicy(
+ DeploymentPolicy deploymentPolicy) {
if (deploymentPolicy == null) {
return null;
@@ -1997,7 +2020,8 @@ public class ObjectConverter {
applicationPolicy.setNetworkPartitions(applicationPolicyBean.getNetworkPartitions());
if (applicationPolicyBean.getProperties() != null) {
if (!applicationPolicyBean.getProperties().isEmpty()) {
- applicationPolicy.setProperties(getASPropertiesFromCommonProperties(applicationPolicyBean.getProperties()));
+ applicationPolicy.setProperties(getASPropertiesFromCommonProperties(
+ applicationPolicyBean.getProperties()));
}
}
return applicationPolicy;
@@ -2038,7 +2062,8 @@ public class ObjectConverter {
}
- private static DeploymentPolicyBean convertASStubDeploymentPolicyToDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
+ private static DeploymentPolicyBean convertASStubDeploymentPolicyToDeploymentPolicy(
+ DeploymentPolicy deploymentPolicy) {
if (deploymentPolicy == null) {
return null;