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/04/07 09:35:14 UTC
[5/6] stratos git commit: Formatting cloud controller code
Formatting cloud controller code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/de76b388
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/de76b388
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/de76b388
Branch: refs/heads/master
Commit: de76b3883b1a25d654e7c65bd7593d4c5bc3ceee
Parents: 65e8f16
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 7 13:04:35 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 7 13:04:35 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 42 +-
.../config/CloudControllerConfig.java | 4 +-
.../parser/CloudControllerConfigParser.java | 23 +-
.../config/parser/IaasProviderConfigParser.java | 11 +-
.../context/CloudControllerContext.java | 72 +--
.../deployers/CloudControllerDeployer.java | 10 +-
.../cloud/controller/domain/AppType.java | 51 +-
.../domain/ApplicationClusterContext.java | 20 +-
.../cloud/controller/domain/Cartridge.java | 160 ++---
.../cloud/controller/domain/ClusterContext.java | 58 +-
.../domain/CompositeApplicationDefinition.java | 72 ++-
.../controller/domain/ConfigCartridge.java | 18 +-
.../controller/domain/ConfigDependencies.java | 42 +-
.../controller/domain/ConfigDependencyPair.java | 52 +-
.../cloud/controller/domain/ConfigGroup.java | 58 +-
.../cloud/controller/domain/Container.java | 64 +-
.../domain/ContainerClusterContext.java | 13 +-
.../controller/domain/DataPublisherConfig.java | 5 +-
.../cloud/controller/domain/Dependencies.java | 18 +-
.../controller/domain/FloatingNetwork.java | 107 ++--
.../controller/domain/FloatingNetworks.java | 28 +-
.../cloud/controller/domain/IaasConfig.java | 42 +-
.../cloud/controller/domain/IaasProvider.java | 102 +--
.../controller/domain/LoadbalancerConfig.java | 10 +-
.../cloud/controller/domain/MemberContext.java | 65 +-
.../controller/domain/NetworkInterface.java | 175 +++---
.../controller/domain/NetworkInterfaces.java | 34 +-
.../controller/domain/NetworkPartition.java | 24 +-
.../cloud/controller/domain/Partition.java | 33 +-
.../cloud/controller/domain/PortMapping.java | 84 +--
.../cloud/controller/domain/Registrant.java | 24 +-
.../cloud/controller/domain/ServiceGroup.java | 16 +-
.../cloud/controller/domain/TopologyConfig.java | 21 +-
.../stratos/cloud/controller/domain/Volume.java | 106 ++--
.../domain/kubernetes/KubernetesCluster.java | 2 +-
.../kubernetes/KubernetesClusterContext.java | 148 +++--
...ApplicationClusterRegistrationException.java | 8 +-
.../ApplicationDefinitionException.java | 8 +-
.../CartridgeDefinitionNotExistsException.java | 12 +-
.../exception/CartridgeNotFoundException.java | 14 +-
.../exception/CloudControllerException.java | 4 +-
.../ClusterInstanceCreationException.java | 8 +-
.../exception/DeserializationException.java | 4 +-
.../InvalidCartridgeDefinitionException.java | 18 +-
.../InvalidCartridgeTypeException.java | 18 +-
.../exception/InvalidClusterException.java | 18 +-
...CompositeApplicationDefinitionException.java | 18 +-
.../exception/InvalidHostException.java | 18 +-
.../exception/InvalidIaasProviderException.java | 18 +-
.../InvalidKubernetesClusterException.java | 6 +-
.../InvalidKubernetesHostException.java | 6 +-
.../InvalidKubernetesMasterException.java | 6 +-
.../exception/InvalidMemberException.java | 18 +-
.../exception/InvalidPartitionException.java | 14 +-
.../exception/InvalidRegionException.java | 14 +-
.../exception/InvalidServiceGroupException.java | 24 +-
.../exception/InvalidXMLException.java | 16 +-
.../exception/InvalidZoneException.java | 14 +-
.../KubernetesEndpointValidationException.java | 5 +-
.../MemberTerminationFailedException.java | 17 +-
.../NetworkPartitionAlreadyExistsException.java | 8 +-
.../NetworkPartitionNotExistsException.java | 8 +-
.../exception/NoInstanceFoundException.java | 12 +-
.../NonExistingKubernetesClusterException.java | 6 +-
.../NonExistingKubernetesHostException.java | 6 +-
.../NonExistingKubernetesMasterException.java | 6 +-
.../exception/SerializationException.java | 14 +-
.../exception/UnregisteredClusterException.java | 12 +-
.../stratos/cloud/controller/iaases/Iaas.java | 3 +
.../cloud/controller/iaases/JcloudsIaas.java | 49 +-
.../controller/iaases/JcloudsIaasUtil.java | 2 +-
.../controller/iaases/PartitionValidator.java | 6 +-
.../CloudControllerServiceComponent.java | 68 +-
.../internal/ServiceReferenceHolder.java | 18 +-
.../controller/registry/RegistryManager.java | 21 +-
.../services/CloudControllerService.java | 626 ++++++++++---------
.../util/CloudControllerConstants.java | 496 +++++++--------
.../controller/util/CloudControllerUtil.java | 166 ++---
.../util/ComputeServiceBuilderUtil.java | 64 +-
.../src/main/resources/META-INF/component.xml | 2 +-
.../src/main/resources/cartridge.xsd | 255 ++++----
.../src/main/resources/cartridges.xsd | 282 ++++-----
.../src/main/resources/service.xsd | 87 +--
.../src/main/resources/services.xsd | 97 +--
.../service/axiom/AxiomValidationTest.java | 58 +-
.../service/axiom/AxiomXpathParserTest.java | 22 +-
.../axiom/CloudControllerContextTest.java | 72 +--
.../src/test/resources/cartridges-1.xml | 64 +-
.../src/test/resources/cartridges-2.xml | 64 +-
.../src/test/resources/cartridges-3.xml | 30 +-
.../src/test/resources/cartridges-4.xml | 62 +-
.../src/test/resources/cartridges-5.xml | 56 +-
.../src/test/resources/cartridges-6.xml | 36 +-
.../src/test/resources/cartridges-7.xml | 78 +--
.../src/test/resources/cartridges-8.xml | 172 ++---
.../src/test/resources/cartridges-9.xml | 130 ++--
.../src/test/resources/cloud-controller.xml | 98 +--
97 files changed, 2698 insertions(+), 2678 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index d969d29..51139ee 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -49,11 +49,11 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- !org.apache.stratos.cloud.controller.internal.*,
- org.apache.stratos.cloud.controller.*,
+ !org.apache.stratos.cloud.controller.internal.*,
+ org.apache.stratos.cloud.controller.*,
</Export-Package>
<Private-Package>
- org.apache.stratos.cloud.controller.internal.*,
+ org.apache.stratos.cloud.controller.internal.*,
</Private-Package>
<Import-Package>
!org.apache.commons.logging,
@@ -70,20 +70,20 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <configuration>
- <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
- <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
- <serviceName>CloudControllerService</serviceName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>java2wsdl</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
+ <configuration>
+ <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
+ <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
+ <serviceName>CloudControllerService</serviceName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java2wsdl</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -110,7 +110,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
+ <groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.kubernetes.client</artifactId>
<version>${project.version}</version>
</dependency>
@@ -248,9 +248,9 @@
<version>${jclouds.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>gce</artifactId>
- <version>${jclouds.stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>gce</artifactId>
+ <version>${jclouds.stratos.version}</version>
</dependency>
<dependency>
<groupId>com.jamesmurty.utils.wso2</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
index 6af58fb..0735b00 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
@@ -66,12 +66,12 @@ public class CloudControllerConfig {
}
public IaasProvider getIaasProvider(String type) {
- if(type == null) {
+ if (type == null) {
return null;
}
for (IaasProvider iaasProvider : iaasProviders) {
- if(type.equals(iaasProvider.getType())) {
+ if (type.equals(iaasProvider.getType())) {
return iaasProvider;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
index 0f2491b..f1e3db4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
@@ -37,8 +37,6 @@ import java.util.List;
/**
* Parse the cloud-controller.xml
- *
- *
*/
public class CloudControllerConfigParser {
private static final Log log = LogFactory.getLog(CloudControllerConfigParser.class);
@@ -46,6 +44,7 @@ public class CloudControllerConfigParser {
/**
* Parse the cloud-controller.xml file.
+ *
* @param documentElement document element.
* @throws MalformedConfigurationFileException
*/
@@ -53,14 +52,12 @@ public class CloudControllerConfigParser {
extractIaasProviders(documentElement, AxiomXpathParserUtil.getMatchingNodes(documentElement, CloudControllerConstants.IAAS_PROVIDER_XPATH));
extractDataPublisherConfig(documentElement, AxiomXpathParserUtil.getElement(FILE_NAME, documentElement, CloudControllerConstants.DATA_PUBLISHER_ELEMENT,
- CloudControllerConstants.DATA_PUBLISHER_XPATH));
+ CloudControllerConstants.DATA_PUBLISHER_XPATH));
extractTopologySyncConfig(documentElement, AxiomXpathParserUtil.getElement(FILE_NAME, documentElement, CloudControllerConstants.TOPOLOGY_SYNC_ELEMENT,
- CloudControllerConstants.TOPOLOGY_SYNC_XPATH));
+ CloudControllerConstants.TOPOLOGY_SYNC_XPATH));
}
-
-
private static void extractIaasProviders(OMElement documentElement, List<OMNode> nodeList) {
List<IaasProvider> iaasProviders = CloudControllerConfig.getInstance().getIaasProviders();
@@ -71,18 +68,18 @@ public class CloudControllerConfigParser {
// this is a valid scenario. User can have 0..1 iaas provider elements
// in cloud-controller xml.
if (nodeList == null || nodeList.isEmpty()) {
- log.debug("No IaasProvider element found in "+FILE_NAME);
+ log.debug("No IaasProvider element found in " + FILE_NAME);
return;
}
-
+
for (OMNode node : nodeList) {
iaasProviders.add(IaasProviderConfigParser.getIaasProvider(FILE_NAME, documentElement, node, null));
}
}
-
+
private static void extractDataPublisherConfig(OMElement documentElement, OMElement element) {
if (element == null) {
- log.debug("No data publisher config found in "+FILE_NAME);
+ log.debug("No data publisher config found in " + FILE_NAME);
return;
}
@@ -102,7 +99,7 @@ public class CloudControllerConfigParser {
DataPublisherConfig dataPublisherConfig = new DataPublisherConfig();
config.setDataPubConfig(dataPublisherConfig);
-
+
if (childElement != null) {
// set bam user name
elt =
@@ -170,13 +167,13 @@ public class CloudControllerConfigParser {
private static void extractTopologySyncConfig(OMElement elt, OMElement element) {
if (element == null) {
- log.debug("No Topology sync config is found "+FILE_NAME);
+ log.debug("No Topology sync config is found " + FILE_NAME);
return;
}
// get enable attribute
boolean isEnable = Boolean.parseBoolean(element.getAttributeValue(new QName(
- CloudControllerConstants.ENABLE_ATTR)));
+ CloudControllerConstants.ENABLE_ATTR)));
CloudControllerConfig config = CloudControllerConfig.getInstance();
config.setEnableTopologySync(isEnable);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
index aa98450..959388d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
@@ -35,8 +35,6 @@ import java.util.Map;
/**
* Parse the iaas providers.
- *
- *
*/
public class IaasProviderConfigParser {
private static final Log log = LogFactory.getLog(IaasProviderConfigParser.class);
@@ -103,7 +101,7 @@ public class IaasProviderConfigParser {
return iaas;
}
-
+
private static void loadClassName(final String fileName, final IaasProvider iaas, final OMElement iaasElt) {
Iterator<?> it =
@@ -227,7 +225,6 @@ public class IaasProviderConfigParser {
}
-
public static void loadProperties(final String fileName, final OMElement elt, final Map<String, String> propertyMap) {
Iterator<?> it =
@@ -247,7 +244,7 @@ public class IaasProviderConfigParser {
}
propertyMap.put(prop.getAttribute(new QName(CloudControllerConstants.PROPERTY_NAME_ATTR))
- .getAttributeValue(),
+ .getAttributeValue(),
prop.getAttribute(new QName(CloudControllerConstants.PROPERTY_VALUE_ATTR))
.getAttributeValue());
}
@@ -296,8 +293,8 @@ public class IaasProviderConfigParser {
}
-
- private static void handleException(final String msg) throws MalformedConfigurationFileException{
+
+ private static void handleException(final String msg) throws MalformedConfigurationFileException {
log.error(msg);
throw new MalformedConfigurationFileException(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 52036c5..f9a73c3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -62,7 +62,7 @@ public class CloudControllerContext implements Serializable {
private static final String CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP = "CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP";
private static final String CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP = "CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP";
private static final String CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP = "CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP";
- private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
+ private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
private static final String CC_CLUSTER_CTX_WRITE_LOCK = "CC_CLUSTER_CTX_WRITE_LOCK";
private static final String CC_MEMBER_CTX_WRITE_LOCK = "CC_MEMBER_CTX_WRITE_LOCK";
@@ -79,8 +79,8 @@ public class CloudControllerContext implements Serializable {
private final transient DistributedObjectProvider distributedObjectProvider;
/* We keep following maps in order to make the look up time, small. */
-
- /**
+
+ /**
* KubernetesClusters against clusterIds
* Key - Kubernetes cluster id
* Value - {@link org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster}
@@ -144,12 +144,12 @@ public class CloudControllerContext implements Serializable {
*/
private Map<String, ServiceGroup> serviceGroupNameToServiceGroupMap;
- /**
- * Map of network partitions
- * Key - network partition id
- * Value network partition
- */
- private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap;
+ /**
+ * Map of network partitions
+ * Key - network partition id
+ * Value network partition
+ */
+ private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap;
/**
* Key - cartridge id (cartridge type is used as an unique identifier)
@@ -192,7 +192,7 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToPartitionIdsMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP);
cartridgeTypeToCartridgeMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP);
serviceGroupNameToServiceGroupMap = distributedObjectProvider.getMap(CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP);
- networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
+ networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
partitionToIaasProviderByCartridge = distributedObjectProvider.getMap(CC_PARTITION_TO_IAAS_PROVIDER_BY_CARTRIDGE_MAP);
cartridgeTypeToIaasProviders = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_IAAS_PROVIDER_MAP);
// Update context from the registry
@@ -215,13 +215,13 @@ public class CloudControllerContext implements Serializable {
}
public void addCartridges(List<Cartridge> cartridges) {
- for(Cartridge cartridge : cartridges) {
+ for (Cartridge cartridge : cartridges) {
addCartridge(cartridge);
}
}
public void addServiceGroups(List<ServiceGroup> serviceGroups) {
- for(ServiceGroup serviceGroup : serviceGroups) {
+ for (ServiceGroup serviceGroup : serviceGroups) {
addServiceGroup(serviceGroup);
}
}
@@ -274,24 +274,24 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToCartridgeMap.put(cartridge.getType(), cartridge);
}
- public void addNetworkPartition(NetworkPartition networkPartition) {
- networkPartitionIDToNetworkPartitionMap.put(networkPartition.getId(), networkPartition);
- }
+ public void addNetworkPartition(NetworkPartition networkPartition) {
+ networkPartitionIDToNetworkPartitionMap.put(networkPartition.getId(), networkPartition);
+ }
- public NetworkPartition getNetworkPartition(String networkPartitionID) {
- return networkPartitionIDToNetworkPartitionMap.get(networkPartitionID);
- }
-
- public Collection<NetworkPartition> getNetworkPartitions() {
- return networkPartitionIDToNetworkPartitionMap.values();
- }
+ public NetworkPartition getNetworkPartition(String networkPartitionID) {
+ return networkPartitionIDToNetworkPartitionMap.get(networkPartitionID);
+ }
- public void removeNetworkPartition(String networkPartitionID) {
- networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID);
- }
+ public Collection<NetworkPartition> getNetworkPartitions() {
+ return networkPartitionIDToNetworkPartitionMap.values();
+ }
+
+ public void removeNetworkPartition(String networkPartitionID) {
+ networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID);
+ }
- public void removeCartridge(Cartridge cartridge) {
- if(cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) {
+ public void removeCartridge(Cartridge cartridge) {
+ if (cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) {
cartridgeTypeToCartridgeMap.remove(cartridge.getType());
}
}
@@ -309,13 +309,13 @@ public class CloudControllerContext implements Serializable {
}
public void removeServiceGroups(List<ServiceGroup> serviceGroups) {
- for(ServiceGroup serviceGroup : serviceGroups) {
+ for (ServiceGroup serviceGroup : serviceGroups) {
removeServiceGroup(serviceGroup);
}
}
private void removeServiceGroup(ServiceGroup serviceGroup) {
- if(serviceGroupNameToServiceGroupMap.containsKey(serviceGroup.getName())) {
+ if (serviceGroupNameToServiceGroupMap.containsKey(serviceGroup.getName())) {
serviceGroupNameToServiceGroupMap.remove(serviceGroup.getName());
}
}
@@ -499,7 +499,7 @@ public class CloudControllerContext implements Serializable {
kubClusterIdToKubClusterContextMap.put(
kubernetesClusterContext.getKubernetesClusterId(), kubernetesClusterContext);
}
-
+
/**
* Remove a registered Kubernetes cluster from registry
*/
@@ -559,7 +559,7 @@ public class CloudControllerContext implements Serializable {
public void updateKubernetesCluster(KubernetesCluster kubernetesCluster) {
kubernetesClustersMap.put(kubernetesCluster.getClusterId(), kubernetesCluster);
}
-
+
public boolean kubernetesClusterExists(KubernetesCluster kubernetesCluster) {
return kubernetesClustersMap.containsKey(kubernetesCluster);
}
@@ -703,13 +703,13 @@ public class CloudControllerContext implements Serializable {
}
private void copyMap(Map sourceMap, Map destinationMap) {
- for(Object key : sourceMap.keySet()) {
+ for (Object key : sourceMap.keySet()) {
destinationMap.put(key, sourceMap.get(key));
}
}
private void copyList(List sourceList, List destinationList) {
- for(Object item : sourceList) {
+ for (Object item : sourceList) {
destinationList.add(item);
}
}
@@ -730,7 +730,7 @@ public class CloudControllerContext implements Serializable {
public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> map) {
Map<String, IaasProvider> partitionToIaasProviders;
- if(partitionToIaasProviderByCartridge.get(cartridgeType) != null) {
+ if (partitionToIaasProviderByCartridge.get(cartridgeType) != null) {
partitionToIaasProviders = partitionToIaasProviderByCartridge.get(cartridgeType);
} else {
partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>();
@@ -789,12 +789,12 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToIaasProviders.put(cartridgeType, iaasProviders);
}
- public IaasProvider getIaasProvider(String cartridgeType, String iaasType){
+ public IaasProvider getIaasProvider(String cartridgeType, String iaasType) {
List<IaasProvider> iaasProviders = cartridgeTypeToIaasProviders.get(cartridgeType);
if (iaasProviders != null) {
for (IaasProvider iaasProvider : iaasProviders) {
- if(iaasProvider.getType().equals(iaasType)){
+ if (iaasProvider.getType().equals(iaasType)) {
return iaasProvider;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
index e3484f1..e0c9422 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
@@ -73,12 +73,12 @@ public class CloudControllerDeployer extends AbstractDeployer {
// update map
fileToIaasProviderListMap.put(deploymentFileData.getAbsolutePath(),
- new ArrayList<IaasProvider>(
- CloudControllerConfig.getInstance()
- .getIaasProviders()));
+ new ArrayList<IaasProvider>(
+ CloudControllerConfig.getInstance()
+ .getIaasProviders()));
log.info("Successfully deployed the cloud-controller XML file located at " +
- deploymentFileData.getAbsolutePath());
+ deploymentFileData.getAbsolutePath());
}
}
@@ -90,7 +90,7 @@ public class CloudControllerDeployer extends AbstractDeployer {
// remove 'em
CloudControllerConfig.getInstance().getIaasProviders().removeAll(fileToIaasProviderListMap.get(file));
log.info("Successfully un-deployed the cloud-controller XML file specified at " +
- file);
+ file);
}
CloudControllerConfig.getInstance().setDataPubConfig(null);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
index 738c0aa..4fa31fe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
@@ -22,40 +22,39 @@ import java.io.Serializable;
/**
* domain mapping related data.
- *
*/
-public class AppType implements Serializable{
-
+public class AppType implements Serializable {
+
private static final long serialVersionUID = 3550489774139807168L;
- private String name;
- private boolean appSpecificMapping = true;
-
- public AppType() {
- }
-
- public AppType(String name){
- this.setName(name);
- }
-
- public AppType(String name, boolean appSpecificMapping){
- this.setName(name);
- this.setAppSpecificMapping(appSpecificMapping);
- }
-
- public String getName() {
- return name;
+ private String name;
+ private boolean appSpecificMapping = true;
+
+ public AppType() {
+ }
+
+ public AppType(String name) {
+ this.setName(name);
+ }
+
+ public AppType(String name, boolean appSpecificMapping) {
+ this.setName(name);
+ this.setAppSpecificMapping(appSpecificMapping);
+ }
+
+ public String getName() {
+ return name;
}
- public void setName(String name) {
- this.name = name;
+ public void setName(String name) {
+ this.name = name;
}
- public boolean isAppSpecificMapping() {
- return appSpecificMapping;
+ public boolean isAppSpecificMapping() {
+ return appSpecificMapping;
}
- public void setAppSpecificMapping(boolean appSpecificMapping) {
- this.appSpecificMapping = appSpecificMapping;
+ public void setAppSpecificMapping(boolean appSpecificMapping) {
+ this.appSpecificMapping = appSpecificMapping;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
index d213705..a6a1250 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
@@ -41,8 +41,8 @@ public class ApplicationClusterContext {
private String tenantRange;
// properties
private Properties properties;
- //dependencyclusterid
- private String[] dependencyClusterIds;
+ //dependencyclusterid
+ private String[] dependencyClusterIds;
private boolean isVolumeRequired;
@@ -117,7 +117,7 @@ public class ApplicationClusterContext {
public boolean equals(Object other) {
- if(other == null || !(other instanceof ApplicationClusterContext)) {
+ if (other == null || !(other instanceof ApplicationClusterContext)) {
return false;
}
@@ -125,7 +125,7 @@ public class ApplicationClusterContext {
return true;
}
- ApplicationClusterContext that = (ApplicationClusterContext)other;
+ ApplicationClusterContext that = (ApplicationClusterContext) other;
return this.cartridgeType.equals(that.cartridgeType) &&
this.clusterId.equals(that.clusterId);
@@ -143,13 +143,13 @@ public class ApplicationClusterContext {
this.properties = properties;
}
- public String[] getDependencyClusterIds() {
- return dependencyClusterIds;
- }
+ public String[] getDependencyClusterIds() {
+ return dependencyClusterIds;
+ }
- public void setDependencyClusterIds(String[] dependencyClusterIds) {
- this.dependencyClusterIds = dependencyClusterIds;
- }
+ public void setDependencyClusterIds(String[] dependencyClusterIds) {
+ this.dependencyClusterIds = dependencyClusterIds;
+ }
public boolean isVolumeRequired() {
return isVolumeRequired;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index 5196aba..6c78642 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -31,15 +31,15 @@ import java.util.*;
/**
* Holds information regarding a Cartridge.
*/
-public class Cartridge implements Serializable{
+public class Cartridge implements Serializable {
- private transient static final Log log = LogFactory.getLog(Cartridge.class);
+ private transient static final Log log = LogFactory.getLog(Cartridge.class);
private static final long serialVersionUID = 6637409027085059072L;
- private String type;
+ private String type;
private String hostName;
private String provider;
- private String category;
+ private String category;
private String displayName;
private String description;
private String baseDir;
@@ -50,7 +50,7 @@ public class Cartridge implements Serializable{
private Persistence persistence;
private AppType[] appTypeMappings;
private String loadBalancingIPType;
- private String[] metadataKeys;
+ private String[] metadataKeys;
private boolean isPublic;
@@ -64,10 +64,10 @@ public class Cartridge implements Serializable{
private IaasConfig[] iaasConfigs;
- public Cartridge(){
- init();
+ public Cartridge() {
+ init();
}
-
+
public Cartridge(String type, String host, String provider, String version, boolean multiTenant) {
this.type = type;
this.hostName = host;
@@ -76,7 +76,7 @@ public class Cartridge implements Serializable{
this.multiTenant = multiTenant;
init();
}
-
+
private void init() {
tenantPartitions = "*";
properties = new Properties();
@@ -89,7 +89,7 @@ public class Cartridge implements Serializable{
public void setType(String type) {
this.type = type;
}
-
+
public void addProperty(String key, String val) {
if (key != null && val != null) {
Property property = new Property();
@@ -107,26 +107,26 @@ public class Cartridge implements Serializable{
this.properties = properties;
}
- public boolean equals(Object obj) {
- if (obj instanceof Cartridge) {
- return this.type.equals(((Cartridge)obj).getType());
- }
- return false;
- }
-
+ public boolean equals(Object obj) {
+ if (obj instanceof Cartridge) {
+ return this.type.equals(((Cartridge) obj).getType());
+ }
+ return false;
+ }
+
public int hashCode() {
return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
- append(type).
- toHashCode();
+ append(type).
+ toHashCode();
}
- public String getDisplayName() {
- return displayName;
- }
+ public String getDisplayName() {
+ return displayName;
+ }
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
public String getDescription() {
return description;
@@ -136,23 +136,23 @@ public class Cartridge implements Serializable{
this.description = description;
}
- public String getHostName() {
- return hostName;
+ public String getHostName() {
+ return hostName;
}
- public void setHostName(String hostName) {
- this.hostName = hostName;
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
}
-
- public void reset(){
- }
- public String[] getDeploymentDirs() {
- return deploymentDirs;
+ public void reset() {
}
- public void setDeploymentDirs(String[] deploymentDirs) {
- this.deploymentDirs = deploymentDirs;
+ public String[] getDeploymentDirs() {
+ return deploymentDirs;
+ }
+
+ public void setDeploymentDirs(String[] deploymentDirs) {
+ this.deploymentDirs = deploymentDirs;
}
public void addDeploymentDir(String dir) {
@@ -176,64 +176,64 @@ public class Cartridge implements Serializable{
appTypeList.toArray(this.appTypeMappings);
}
- public String getProvider() {
- return provider;
+ public String getProvider() {
+ return provider;
}
- public void setProvider(String provider) {
- this.provider = provider;
+ public void setProvider(String provider) {
+ this.provider = provider;
}
- public String getVersion() {
- return version;
- }
+ public String getVersion() {
+ return version;
+ }
- public void setVersion(String version) {
- this.version = version;
- }
+ public void setVersion(String version) {
+ this.version = version;
+ }
- public boolean isMultiTenant() {
- return multiTenant;
- }
+ public boolean isMultiTenant() {
+ return multiTenant;
+ }
- public void setMultiTenant(boolean multiTenant) {
- this.multiTenant = multiTenant;
- }
+ public void setMultiTenant(boolean multiTenant) {
+ this.multiTenant = multiTenant;
+ }
- public String getBaseDir() {
- return baseDir;
+ public String getBaseDir() {
+ return baseDir;
}
- public void setBaseDir(String baseDir) {
- this.baseDir = baseDir;
+ public void setBaseDir(String baseDir) {
+ this.baseDir = baseDir;
}
- public PortMapping[] getPortMappings() {
- return portMappings;
+ public PortMapping[] getPortMappings() {
+ return portMappings;
}
- public void setPortMappings(PortMapping[] portMappings) {
- this.portMappings = portMappings;
+ public void setPortMappings(PortMapping[] portMappings) {
+ this.portMappings = portMappings;
}
- public AppType[] getAppTypeMappings() {
- return appTypeMappings;
+ public AppType[] getAppTypeMappings() {
+ return appTypeMappings;
}
- public void setAppTypeMappings(AppType[] appTypeMappings) {
- this.appTypeMappings = appTypeMappings;
+ public void setAppTypeMappings(AppType[] appTypeMappings) {
+ this.appTypeMappings = appTypeMappings;
}
/**
- * @return the persistence
- */
+ * @return the persistence
+ */
public Persistence getPersistence() {
return persistence;
}
/**
- * @param persistence the persistenceMappings to set
- */
+ * @param persistence the persistenceMappings to set
+ */
public void setPersistence(Persistence persistence) {
this.persistence = persistence;
}
@@ -246,13 +246,13 @@ public class Cartridge implements Serializable{
this.exportingProperties = exportingProperties;
}
- public String getCategory() {
- return category;
- }
+ public String getCategory() {
+ return category;
+ }
- public void setCategory(String category) {
- this.category = category;
- }
+ public void setCategory(String category) {
+ this.category = category;
+ }
public String getTenantPartitions() {
return tenantPartitions;
@@ -262,13 +262,13 @@ public class Cartridge implements Serializable{
this.tenantPartitions = tenantPartitions;
}
- public String[] getMetadataKeys() {
- return metadataKeys;
- }
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
- public void setMetadataKeys(String[] metadataKeys) {
- this.metadataKeys = metadataKeys;
- }
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
public String getLoadBalancingIPType() {
return loadBalancingIPType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
index f786626..3d3edbb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
@@ -27,10 +27,8 @@ import java.util.List;
/**
* Holds runtime data of a Cluster.
- *
- *
*/
-public class ClusterContext implements Serializable{
+public class ClusterContext implements Serializable {
private static final long serialVersionUID = 4830667953031229223L;
@@ -80,41 +78,41 @@ public class ClusterContext implements Serializable{
return hostName;
}
- public boolean isLbCluster() {
- return isLbCluster;
- }
+ public boolean isLbCluster() {
+ return isLbCluster;
+ }
- public boolean isVolumeRequired() {
- return isVolumeRequired;
- }
+ public boolean isVolumeRequired() {
+ return isVolumeRequired;
+ }
- public void setVolumeRequired(boolean isVolumeRequired) {
- this.isVolumeRequired = isVolumeRequired;
- }
+ public void setVolumeRequired(boolean isVolumeRequired) {
+ this.isVolumeRequired = isVolumeRequired;
+ }
- public long getTimeoutInMillis() {
- return timeoutInMillis;
- }
+ public long getTimeoutInMillis() {
+ return timeoutInMillis;
+ }
- public void setTimeoutInMillis(long timeoutInMillis) {
- this.timeoutInMillis = timeoutInMillis;
- }
+ public void setTimeoutInMillis(long timeoutInMillis) {
+ this.timeoutInMillis = timeoutInMillis;
+ }
- public Volume[] getVolumes() {
- return volumes;
- }
+ public Volume[] getVolumes() {
+ return volumes;
+ }
- public void setVolumes(Volume[] volumes) {
- this.volumes = ArrayUtils.clone(volumes);
- }
+ public void setVolumes(Volume[] volumes) {
+ this.volumes = ArrayUtils.clone(volumes);
+ }
- public Properties getProperties() {
- return properties;
- }
+ public Properties getProperties() {
+ return properties;
+ }
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
public List<KubernetesService> getKubernetesServices() {
return kubernetesServices;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
index 62d46ce..286d477 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
@@ -2,37 +2,45 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class CompositeApplicationDefinition implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private String applicationId;
- private String alias;
- private ConfigGroup[] components;
- private ConfigCartridge [] cartridges;
- public ConfigCartridge[] getCartridges() {
- return cartridges;
- }
- public void setCartridges(ConfigCartridge[] cartridges) {
- this.cartridges = cartridges;
- }
- public String getApplicationId() {
- return applicationId;
- }
- public void setApplicationId(String applicationId) {
- this.applicationId = applicationId;
- }
- public String getAlias() {
- return alias;
- }
- public void setAlias(String alias) {
- this.alias = alias;
- }
- public ConfigGroup[] getComponents() {
- return components;
- }
- public void setComponents(ConfigGroup[] components) {
- this.components = components;
- }
-
+public class CompositeApplicationDefinition implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private String applicationId;
+ private String alias;
+ private ConfigGroup[] components;
+ private ConfigCartridge[] cartridges;
+
+ public ConfigCartridge[] getCartridges() {
+ return cartridges;
+ }
+
+ public void setCartridges(ConfigCartridge[] cartridges) {
+ this.cartridges = cartridges;
+ }
+
+ public String getApplicationId() {
+ return applicationId;
+ }
+
+ public void setApplicationId(String applicationId) {
+ this.applicationId = applicationId;
+ }
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public ConfigGroup[] getComponents() {
+ return components;
+ }
+
+ public void setComponents(ConfigGroup[] components) {
+ this.components = components;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
index d69b90b..0d1b7f8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
@@ -3,15 +3,15 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigCartridge implements Serializable {
- private String alias;
- private static final long serialVersionUID = 1L;
+public class ConfigCartridge implements Serializable {
+ private String alias;
+ private static final long serialVersionUID = 1L;
- public String getAlias() {
- return alias;
- }
+ public String getAlias() {
+ return alias;
+ }
- public void setAlias(String alias) {
- this.alias = alias;
- }
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
index e3abad4..e8a7bea 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
@@ -3,24 +3,26 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigDependencies implements Serializable {
- private ConfigDependencyPair[] startup_order;
- private String kill_behavior;
- private static final long serialVersionUID = 1L;
-
- public ConfigDependencyPair[] getStartup_order() {
- return startup_order;
- }
- public void setStartup_order(ConfigDependencyPair[] startup_order) {
- this.startup_order = startup_order;
- }
- public String getKill_behavior() {
- return kill_behavior;
- }
- public void setKill_behavior(String kill_behavior) {
- this.kill_behavior = kill_behavior;
- }
-
-
-
+public class ConfigDependencies implements Serializable {
+ private ConfigDependencyPair[] startup_order;
+ private String kill_behavior;
+ private static final long serialVersionUID = 1L;
+
+ public ConfigDependencyPair[] getStartup_order() {
+ return startup_order;
+ }
+
+ public void setStartup_order(ConfigDependencyPair[] startup_order) {
+ this.startup_order = startup_order;
+ }
+
+ public String getKill_behavior() {
+ return kill_behavior;
+ }
+
+ public void setKill_behavior(String kill_behavior) {
+ this.kill_behavior = kill_behavior;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
index 6a8c1d0..5fa053f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
@@ -2,28 +2,32 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigDependencyPair implements Serializable {
- private String key;
- private String value;
- private static final long serialVersionUID = 1L;
-
- public ConfigDependencyPair() {}
-
- public ConfigDependencyPair(String key, String value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
- public void setKey(String key) {
- this.key = key;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
+public class ConfigDependencyPair implements Serializable {
+ private String key;
+ private String value;
+ private static final long serialVersionUID = 1L;
+
+ public ConfigDependencyPair() {
+ }
+
+ public ConfigDependencyPair(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
index 3d827f7..cdb5182 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
@@ -3,31 +3,35 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigGroup implements Serializable {
- private String alias;
- private String[] subscribables;
- private ConfigDependencies dependencies;
- private static final long serialVersionUID = 1L;
-
- public String getAlias() {
- return alias;
- }
- public void setAlias(String alias) {
- this.alias = alias;
- }
- public String[] getSubscribables() {
- return subscribables;
- }
- public void setSubscribables(String[] subscribables) {
- this.subscribables = subscribables;
- }
- public ConfigDependencies getDependencies() {
- return dependencies;
- }
- public void setDependencies(ConfigDependencies dependencies) {
- this.dependencies = dependencies;
- }
-
-
-
+public class ConfigGroup implements Serializable {
+ private String alias;
+ private String[] subscribables;
+ private ConfigDependencies dependencies;
+ private static final long serialVersionUID = 1L;
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public String[] getSubscribables() {
+ return subscribables;
+ }
+
+ public void setSubscribables(String[] subscribables) {
+ this.subscribables = subscribables;
+ }
+
+ public ConfigDependencies getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(ConfigDependencies dependencies) {
+ this.dependencies = dependencies;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
index 5cb8708..fec9ff8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
@@ -24,36 +24,36 @@ import java.util.Map;
public class Container implements Serializable {
- private static final long serialVersionUID = 2232204459987683768L;
-
- private String imageName;
-
- private String dockerFileRepo;
-
- private Map<String, String> properties = new HashMap<String, String>();
-
- public String getImageName() {
- return imageName;
- }
-
- public void setImageName(String imageName) {
- this.imageName = imageName;
- }
-
- public String getDockerFileRepo() {
- return dockerFileRepo;
- }
-
- public void setDockerFileRepo(String dockerFileRepo) {
- this.dockerFileRepo = dockerFileRepo;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-
+ private static final long serialVersionUID = 2232204459987683768L;
+
+ private String imageName;
+
+ private String dockerFileRepo;
+
+ private Map<String, String> properties = new HashMap<String, String>();
+
+ public String getImageName() {
+ return imageName;
+ }
+
+ public void setImageName(String imageName) {
+ this.imageName = imageName;
+ }
+
+ public String getDockerFileRepo() {
+ return dockerFileRepo;
+ }
+
+ public void setDockerFileRepo(String dockerFileRepo) {
+ this.dockerFileRepo = dockerFileRepo;
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
index fa6e33f..7276673 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
/**
* Holds information about a container cluster to be started.
- *
*/
public class ContainerClusterContext implements Serializable {
@@ -33,26 +32,28 @@ public class ContainerClusterContext implements Serializable {
private String clusterId;
// partition this member is in.
private Partition partition;
- // instance id - derived from nodeId
+ // instance id - derived from nodeId
private String instanceId;
- //network partition id
+ //network partition id
private String networkPartitionId;
// properties
private Properties properties;
-
+
public ContainerClusterContext() {
}
-
+
public ContainerClusterContext(String clusterId) {
this.clusterId = clusterId;
}
-
+
public String getClusterId() {
return clusterId;
}
+
public void setClusterId(String clusterId) {
this.clusterId = clusterId;
}
+
public Properties getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
index 735dbdc..5e72c47 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
@@ -26,7 +26,7 @@ import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
*
*
*/
-public class DataPublisherConfig implements Serializable{
+public class DataPublisherConfig implements Serializable {
private static final long serialVersionUID = -2097472019584151205L;
private String bamUsername = CloudControllerConstants.DEFAULT_BAM_SERVER_USER_NAME;
@@ -35,7 +35,7 @@ public class DataPublisherConfig implements Serializable{
private String cassandraConnUrl = CloudControllerConstants.DEFAULT_CASSANDRA_URL;
private String cassandraUser = CloudControllerConstants.DEFAULT_CASSANDRA_USER;
private String cassandraPassword = CloudControllerConstants.DEFAULT_CASSANDRA_PASSWORD;
-
+
public String getBamUsername() {
return bamUsername;
}
@@ -59,6 +59,7 @@ public class DataPublisherConfig implements Serializable{
public void setDataPublisherCron(String dataPublisherCron) {
this.dataPublisherCron = dataPublisherCron;
}
+
public String getCassandraConnUrl() {
return cassandraConnUrl;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
index a04fb91..9299528 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
@@ -24,9 +24,9 @@ import java.util.List;
public class Dependencies implements Serializable {
- private static final long serialVersionUID = 4187267350546153680L;
-
- private String [] startupOrders;
+ private static final long serialVersionUID = 4187267350546153680L;
+
+ private String[] startupOrders;
private String killBehaviour;
@@ -38,11 +38,11 @@ public class Dependencies implements Serializable {
this.killBehaviour = killBehaviour;
}
- public String[] getStartupOrders() {
- return startupOrders;
- }
+ public String[] getStartupOrders() {
+ return startupOrders;
+ }
- public void setStartupOrders(String[] startupOrders) {
- this.startupOrders = startupOrders;
- }
+ public void setStartupOrders(String[] startupOrders) {
+ this.startupOrders = startupOrders;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
index 8a83733..1d047fe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
@@ -21,67 +21,68 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
/**
- * Every {@link NetworkInterface} can have
- * an array of {@link FloatingNetwork}
+ * Every {@link NetworkInterface} can have
+ * an array of {@link FloatingNetwork}
* to which the network interface is associated
+ *
* @author rajkumar
*/
-public class FloatingNetwork implements Serializable{
+public class FloatingNetwork implements Serializable {
+
+ private static final long serialVersionUID = -432127317992004321L;
+ private String name;
+ private String networkUuid;
+ private String floatingIP;
+
+ public FloatingNetwork() {
+ }
+
+ public FloatingNetwork(String name, String networkUuid, String flotingIP) {
+ this.name = name;
+ this.networkUuid = networkUuid;
+ this.floatingIP = flotingIP;
+ }
+
+ public String getName() {
+ return name;
+ }
- private static final long serialVersionUID = -432127317992004321L;
- private String name;
- private String networkUuid;
- private String floatingIP;
-
- public FloatingNetwork() {
- }
-
- public FloatingNetwork(String name, String networkUuid, String flotingIP) {
- this.name = name;
- this.networkUuid = networkUuid;
- this.floatingIP = flotingIP;
- }
-
- public String getName() {
- return name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
- public String getNetworkUuid() {
- return networkUuid;
- }
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
- public void setNetworkUuid(String networkUuid) {
- this.networkUuid = networkUuid;
- }
-
- public String getFloatingIP() {
- return floatingIP;
- }
+ public String getFloatingIP() {
+ return floatingIP;
+ }
- public void setFloatingIP(String floatingIP) {
- this.floatingIP = floatingIP;
- }
+ public void setFloatingIP(String floatingIP) {
+ this.floatingIP = floatingIP;
+ }
- public String toString() {
- StringBuilder sb = new StringBuilder('{');
- String delimeter = "";
- if (name != null) {
- sb.append(delimeter).append("name : ").append(name);
- delimeter = ", ";
- }
- if (networkUuid != null) {
- sb.append(delimeter).append("networkUuid : ").append(networkUuid);
- delimeter = ", ";
- }
- if (floatingIP != null) {
- sb.append(delimeter).append("floatingIP : ").append(floatingIP);
- delimeter = ", ";
- }
- sb.append('}');
+ public String toString() {
+ StringBuilder sb = new StringBuilder('{');
+ String delimeter = "";
+ if (name != null) {
+ sb.append(delimeter).append("name : ").append(name);
+ delimeter = ", ";
+ }
+ if (networkUuid != null) {
+ sb.append(delimeter).append("networkUuid : ").append(networkUuid);
+ delimeter = ", ";
+ }
+ if (floatingIP != null) {
+ sb.append(delimeter).append("floatingIP : ").append(floatingIP);
+ delimeter = ", ";
+ }
+ sb.append('}');
return sb.toString();
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
index 01ecda1..f90113f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
@@ -23,21 +23,23 @@ import java.util.Arrays;
/**
* Wrapping {@link FloatingNetwork} array
+ *
* @author rajkumar
*/
-public class FloatingNetworks implements Serializable{
-
- private static final long serialVersionUID = -6754884581236402662L;
- private FloatingNetwork[] floatingNetworks;
-
- public FloatingNetwork[] getFloatingNetworks() {
- return floatingNetworks;
- }
- public void setFloatingNetworks(FloatingNetwork[] floatingNetworks) {
- this.floatingNetworks = floatingNetworks;
- }
-
- @Override
+public class FloatingNetworks implements Serializable {
+
+ private static final long serialVersionUID = -6754884581236402662L;
+ private FloatingNetwork[] floatingNetworks;
+
+ public FloatingNetwork[] getFloatingNetworks() {
+ return floatingNetworks;
+ }
+
+ public void setFloatingNetworks(FloatingNetwork[] floatingNetworks) {
+ this.floatingNetworks = floatingNetworks;
+ }
+
+ @Override
public String toString() {
return "FloatingNetworks [FloatingNetworks =" + Arrays.toString(floatingNetworks) + "]";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
index 2efbec9..3db5e63 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
@@ -35,69 +35,69 @@ public class IaasConfig implements Serializable {
private static final long serialVersionUID = 3329046207651171707L;
private String type;
-
+
private String className;
-
+
private String name;
-
+
private String provider, identity, credential;
-
+
private String imageId;
private Properties properties;
-
+
private NetworkInterfaces networkInterfaces;
-
+
private byte[] payload;
public String getClassName() {
return className;
}
-
+
public void setClassName(String className) {
this.className = className;
}
-
+
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
-
+
public String getProvider() {
return provider;
}
-
+
public void setProvider(String provider) {
this.provider = provider;
}
-
+
public String getIdentity() {
return identity;
}
-
+
public void setIdentity(String identity) {
this.identity = identity;
}
-
+
public String getCredential() {
return credential;
}
-
+
public void setCredential(String credential) {
this.credential = credential;
}
-
+
public byte[] getPayload() {
return payload;
}
-
+
public void setPayload(byte[] payload) {
this.payload = ArrayUtils.clone(payload);
}
-
+
public static long getSerialversionuid() {
return serialVersionUID;
}
@@ -126,19 +126,19 @@ public class IaasConfig implements Serializable {
this.properties = properties;
}
- public String toString () {
+ public String toString() {
return " [ Type: " + type + ", Name: " + name + ", Class Name: " + className + ", Image Id: " + imageId +
", Provider: " + provider + ", Identity: " + identity +
", Credentials: " + credential + ", Properties: " + getIaasProperties() + " ] ";
}
- private String getIaasProperties () {
+ private String getIaasProperties() {
StringBuilder iaasPropertyBuilder = new StringBuilder();
if (properties != null) {
Property[] propertyArray = properties.getProperties();
- if(propertyArray.length > 0) {
+ if (propertyArray.length > 0) {
for (Property property : propertyArray) {
iaasPropertyBuilder.append(property.toString() + " | ");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
index 87d77fc..71c78d1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
@@ -35,10 +35,10 @@ import java.util.Map;
* NOTE: If you add a new attribute, please assign it in the constructor too.
*/
public class IaasProvider implements Serializable {
-
+
private static final long serialVersionUID = -940288190885166118L;
- /**
+ /**
* Type of the IaasProvider.
*/
private String type;
@@ -48,64 +48,65 @@ public class IaasProvider implements Serializable {
* Fully qualified class name of an implementation of {@link org.apache.stratos.cloud.controller.iaases.Iaas}
*/
private String className;
-
+
/**
* human description of this IaaS provider
*/
private String name;
-
+
/**
* Property map of this IaaS provider.
*/
private Map<String, String> properties = new HashMap<String, String>();
-
+
/**
* Network Interfaces Configuration
*/
private NetworkInterface[] networkInterfaces;
-
+
/**
* Image identifier.
*/
private String image;
-
+
private String provider, identity, credential;
-
+
private transient ComputeService computeService;
-
+
private transient Template template;
-
+
private byte[] payload;
-
- /**
+
+ /**
* Corresponding {@link org.apache.stratos.cloud.controller.iaases.Iaas} implementation
*/
private transient Iaas iaas;
-
- public IaasProvider(){}
-
- public IaasProvider(IaasProvider anIaasProvider){
- this.type = anIaasProvider.getType();
- this.name = anIaasProvider.getName();
- this.className = anIaasProvider.getClassName();
- this.computeService = anIaasProvider.getComputeService();
- this.properties = new HashMap<String,String>(anIaasProvider.getProperties());
- this.networkInterfaces = anIaasProvider.getNetworkInterfaces();
- this.image = anIaasProvider.getImage();
- this.provider = anIaasProvider.getProvider();
- this.identity = anIaasProvider.getIdentity();
- this.credential = anIaasProvider.getCredential();
- this.payload = anIaasProvider.getPayload();
- }
-
+
+ public IaasProvider() {
+ }
+
+ public IaasProvider(IaasProvider anIaasProvider) {
+ this.type = anIaasProvider.getType();
+ this.name = anIaasProvider.getName();
+ this.className = anIaasProvider.getClassName();
+ this.computeService = anIaasProvider.getComputeService();
+ this.properties = new HashMap<String, String>(anIaasProvider.getProperties());
+ this.networkInterfaces = anIaasProvider.getNetworkInterfaces();
+ this.image = anIaasProvider.getImage();
+ this.provider = anIaasProvider.getProvider();
+ this.identity = anIaasProvider.getIdentity();
+ this.credential = anIaasProvider.getCredential();
+ this.payload = anIaasProvider.getPayload();
+ }
+
public String getType() {
return type;
}
-
+
public void setType(String id) {
this.type = id;
}
-
+
public String getProperty(String key) {
return properties.get(key);
}
@@ -113,16 +114,16 @@ public class IaasProvider implements Serializable {
public Map<String, String> getProperties() {
return properties;
}
-
+
public void addProperty(String key, String val) {
if (key != null && val != null) {
properties.put(key, val);
}
}
-
+
public void setProperty(String key, String value) {
-
- if(key != null && value != null){
+
+ if (key != null && value != null) {
properties.put(key, value);
}
}
@@ -186,26 +187,25 @@ public class IaasProvider implements Serializable {
public void setTemplate(Template template) {
this.template = template;
}
-
-
+
public boolean equals(Object o) {
- if(o instanceof IaasProvider){
+ if (o instanceof IaasProvider) {
return ((IaasProvider) o).getType().equals(this.getType());
}
-
+
return false;
}
-
+
public int hashCode() {
return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
- append(type).
- toHashCode();
+ append(type).
+ toHashCode();
+ }
+
+ public IaasProvider copy() {
+ return new IaasProvider(this);
}
-
- public IaasProvider copy(){
- return new IaasProvider(this);
- }
public String getClassName() {
return className;
@@ -216,9 +216,9 @@ public class IaasProvider implements Serializable {
}
public Iaas getIaas() {
- if (iaas == null) {
+ if (iaas == null) {
synchronized (IaasProvider.this) {
- if(iaas == null) {
+ if (iaas == null) {
try {
iaas = CloudControllerUtil.createIaasInstance(this);
iaas.initialize();
@@ -227,11 +227,11 @@ public class IaasProvider implements Serializable {
}
}
}
- }
+ }
return iaas;
}
-
- public void reset(){
+
+ public void reset() {
// nodeIds = new ArrayList<String>();
// nodes = new HashMap<String, NodeMetadata>();
// toBeRemovedNodeIds = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
index 1e780cf..3165918 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
@@ -33,9 +33,9 @@ public class LoadbalancerConfig implements Serializable {
private static final long serialVersionUID = 289225330995632449L;
private String type;
-
+
private Properties properties;
-
+
public String getType() {
return type;
}
@@ -52,17 +52,17 @@ public class LoadbalancerConfig implements Serializable {
this.properties = properties;
}
- public String toString () {
+ public String toString() {
return " [ Type: " + type + ", Properties: " + getIaasProperties() + " ] ";
}
- private String getIaasProperties () {
+ private String getIaasProperties() {
StringBuilder iaasPropertyBuilder = new StringBuilder();
if (properties != null) {
Property[] propertyArray = properties.getProperties();
- if(propertyArray.length > 0) {
+ if (propertyArray.length > 0) {
for (Property property : propertyArray) {
iaasPropertyBuilder.append(property.toString() + " | ");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
index 2388e99..ebe2940 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
/**
* Holds information about a Member.
- *
*/
public class MemberContext implements Serializable {
@@ -91,7 +90,7 @@ public class MemberContext implements Serializable {
public String getApplicationId() {
return applicationId;
}
-
+
public String getMemberId() {
return memberId;
}
@@ -119,7 +118,7 @@ public class MemberContext implements Serializable {
public void setDefaultPublicIP(String defaultPublicIP) {
this.defaultPublicIP = defaultPublicIP;
}
-
+
public String[] getPublicIPs() {
return publicIPs;
}
@@ -135,7 +134,7 @@ public class MemberContext implements Serializable {
public void setDefaultPrivateIP(String defaultPrivateIP) {
this.defaultPrivateIP = defaultPrivateIP;
}
-
+
public String[] getPrivateIPs() {
return privateIPs;
}
@@ -176,45 +175,45 @@ public class MemberContext implements Serializable {
this.networkPartitionId = networkPartitionId;
}
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((clusterId == null) ? 0 : clusterId.hashCode());
- result = prime * result
- + ((memberId == null) ? 0 : memberId.hashCode());
- result = prime * result + ((instanceId == null) ? 0 : instanceId.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((clusterId == null) ? 0 : clusterId.hashCode());
+ result = prime * result
+ + ((memberId == null) ? 0 : memberId.hashCode());
+ result = prime * result + ((instanceId == null) ? 0 : instanceId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
MemberContext other = (MemberContext) obj;
- if(getApplicationId().equals(other.getApplicationId()) &&
+ if (getApplicationId().equals(other.getApplicationId()) &&
getCartridgeType().equals(other.getCartridgeType()) &&
getClusterId().equals(other.getClusterId()) &&
getMemberId().equals(other.getMemberId()) &&
getInstanceId().equals(other.getInstanceId())) {
return true;
}
- return false;
- }
+ return false;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
public long getObsoleteExpiryTime() {
return obsoleteExpiryTime;