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 07:53:59 UTC
[6/7] stratos git commit: Format autoscaler component code
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index b22c93d..9ae5f3b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -112,24 +112,25 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Find subscribable information in cartridge contexts
- * @param applicationId TODO
+ *
+ * @param applicationId TODO
* @param subscribableInfoContextMap Map to return subscribable information
- * @param cartridgeContexts Application to read cartridge contexts
+ * @param cartridgeContexts Application to read cartridge contexts
* @return
* @throws ApplicationDefinitionException
*/
- private void findSubscribableInfoOfCartridgeContexts(String applicationId,
- Map<String, SubscribableInfoContext> subscribableInfoContextMap, CartridgeContext[] cartridgeContexts)
+ private void findSubscribableInfoOfCartridgeContexts(String applicationId,
+ Map<String, SubscribableInfoContext> subscribableInfoContextMap, CartridgeContext[] cartridgeContexts)
throws ApplicationDefinitionException {
- if(cartridgeContexts != null) {
- for(CartridgeContext cartridgeContext : cartridgeContexts) {
- if(cartridgeContext != null) {
- SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
- addSubscribableInfo(applicationId,cartridgeContext.getType(), subscribableInfoContextMap, subscribableInfoContext);
- }
- }
- }
+ if (cartridgeContexts != null) {
+ for (CartridgeContext cartridgeContext : cartridgeContexts) {
+ if (cartridgeContext != null) {
+ SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
+ addSubscribableInfo(applicationId, cartridgeContext.getType(), subscribableInfoContextMap, subscribableInfoContext);
+ }
+ }
+ }
}
private void addSubscribableInfo(String applicationId, String cartridgeType,
@@ -147,54 +148,55 @@ public class DefaultApplicationParser implements ApplicationParser {
if (!ApplicationUtils.isAliasValid(alias)) {
handleError(String.format("Alias is not valid: [application-id] %s " +
- "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
+ "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
}
if (subscribableInfoContextMap.get(alias) != null) {
handleError(String.format("Alias is already defined: [application-id] %s " +
- "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
+ "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
}
- if(StringUtils.isBlank(autoscalingPolicyId)) {
+ if (StringUtils.isBlank(autoscalingPolicyId)) {
handleError(String.format("Autoscaling policy is not defined: [application-id] %s " +
"[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
}
AutoscalePolicy autoscalingPolicy = PolicyManager.getInstance().getAutoscalePolicy(autoscalingPolicyId);
- if(autoscalingPolicy == null) {
+ if (autoscalingPolicy == null) {
handleError(String.format("Autoscaling policy is not found: [application-id] %s " +
- "[cartridge-type] %s [alias] %s [autoscaling-policy] %s", applicationId, cartridgeType,
+ "[cartridge-type] %s [alias] %s [autoscaling-policy] %s", applicationId, cartridgeType,
alias, autoscalingPolicyId));
}
subscribableInfoContextMap.put(alias, subscribableInfoContext);
if (log.isDebugEnabled()) {
log.debug(String.format("Subscribable information added: [application-id] %s " +
- "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
+ "[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
}
}
/**
* Get subscribable information of group contexts recursively.
+ *
* @param subscribableInfoContextMap Map to return subscribable information
- * @param groupContexts Group contexts to read subscribable information
+ * @param groupContexts Group contexts to read subscribable information
* @return
* @throws ApplicationDefinitionException
*/
- private void findSubscribableInfoOfGroupContexts(String applicationId,
- Map<String, SubscribableInfoContext> subscribableInfoContextMap, GroupContext[] groupContexts)
- throws ApplicationDefinitionException {
+ private void findSubscribableInfoOfGroupContexts(String applicationId,
+ Map<String, SubscribableInfoContext> subscribableInfoContextMap, GroupContext[] groupContexts)
+ throws ApplicationDefinitionException {
if (groupContexts != null) {
for (GroupContext groupContext : groupContexts) {
- // finding SubscribableInfo in group
+ // finding SubscribableInfo in group
if (groupContext.getGroupContexts() != null) {
findSubscribableInfoOfGroupContexts(applicationId, subscribableInfoContextMap, groupContext.getGroupContexts());
}
// finding SubscribableInfo in cartridge
if (groupContext.getCartridgeContexts() != null) {
- findSubscribableInfoOfCartridgeContexts(applicationId, subscribableInfoContextMap, groupContext.getCartridgeContexts());
- }
+ findSubscribableInfoOfCartridgeContexts(applicationId, subscribableInfoContextMap, groupContext.getCartridgeContexts());
+ }
}
}
}
@@ -214,15 +216,15 @@ public class DefaultApplicationParser implements ApplicationParser {
String applicationId = applicationContext.getApplicationId();
ComponentContext componentContext = applicationContext.getComponents();
if (componentContext != null) {
- CartridgeContext[] cartridgeContexts = componentContext.getCartridgeContexts();
- if (cartridgeContexts != null) {
- findSubscribableInfoOfCartridgeContexts(applicationId, subscribableInfoContextMap, cartridgeContexts);
- }
- GroupContext[] groupContexts = componentContext.getGroupContexts();
- if (groupContexts != null) {
- findSubscribableInfoOfGroupContexts(applicationId, subscribableInfoContextMap, groupContexts);
- }
- }
+ CartridgeContext[] cartridgeContexts = componentContext.getCartridgeContexts();
+ if (cartridgeContexts != null) {
+ findSubscribableInfoOfCartridgeContexts(applicationId, subscribableInfoContextMap, cartridgeContexts);
+ }
+ GroupContext[] groupContexts = componentContext.getGroupContexts();
+ if (groupContexts != null) {
+ findSubscribableInfoOfGroupContexts(applicationId, subscribableInfoContextMap, groupContexts);
+ }
+ }
return subscribableInfoContextMap;
}
@@ -311,14 +313,14 @@ public class DefaultApplicationParser implements ApplicationParser {
if (components.getGroupContexts() != null) {
application.setGroups(
parseGroups(applicationContext.getApplicationId(), applicationContext.getTenantId(),
- application.getKey(), Arrays.asList(components.getGroupContexts()),
- subscribableInfoCtxts));
+ application.getKey(), Arrays.asList(components.getGroupContexts()),
+ subscribableInfoCtxts));
}
}
-
+
// setting alias to deployment policy id map to the application
application.setAliasToDeploymentPolicyIdMap(
- AutoscalerUtil.getAliasToDeploymentPolicyIdMapOfApplication(applicationContext));
+ AutoscalerUtil.getAliasToDeploymentPolicyIdMapOfApplication(applicationContext));
if (log.isDebugEnabled()) {
log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationId());
@@ -346,31 +348,31 @@ public class DefaultApplicationParser implements ApplicationParser {
Map<String, ClusterDataHolder> clusterDataMap = new HashMap<String, ClusterDataHolder>();
Map<String, ClusterDataHolder> clusterDataMapByType = new HashMap<String, ClusterDataHolder>();
- createClusterDataMap(appId, cartridgeContextList, clusterDataMap, clusterDataMapByType);
+ createClusterDataMap(appId, cartridgeContextList, clusterDataMap, clusterDataMapByType);
- for (CartridgeContext cartridgeContext : cartridgeContextList) {
+ for (CartridgeContext cartridgeContext : cartridgeContextList) {
List<String> dependencyClusterIDs = new ArrayList<String>();
- List<String> exportMetadataKeys = new ArrayList<String>();
- List<String> importMetadataKeys = new ArrayList<String>();
+ List<String> exportMetadataKeys = new ArrayList<String>();
+ List<String> importMetadataKeys = new ArrayList<String>();
String cartridgeType = cartridgeContext.getType();
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
String subscriptionAlias = subscribableInfoContext.getAlias();
Cartridge cartridge = getCartridge(cartridgeType);
- if(cartridge == null) {
+ if (cartridge == null) {
throw new RuntimeException("Cartridge not found: " + cartridgeType);
}
// Add metadata keys defined in cartridges as export metadata keys
- String[] metadataKeys = cartridge.getMetadataKeys();
- if (metadataKeys != null) {
- for (String str : metadataKeys) {
- if(!StringUtils.isBlank(str)) {
- exportMetadataKeys.add(cartridgeContext.getSubscribableInfoContext()
- .getAlias() + METADATA_APPENDER + str);
- }
- }
- }
+ String[] metadataKeys = cartridge.getMetadataKeys();
+ if (metadataKeys != null) {
+ for (String str : metadataKeys) {
+ if (!StringUtils.isBlank(str)) {
+ exportMetadataKeys.add(cartridgeContext.getSubscribableInfoContext()
+ .getAlias() + METADATA_APPENDER + str);
+ }
+ }
+ }
// get hostname and cluster id
ClusterInformation clusterInfo;
@@ -387,26 +389,26 @@ public class DefaultApplicationParser implements ApplicationParser {
repoUrl = subscribableInfoContext.getArtifactRepositoryContext().getRepoUrl();
}
- // Find import metadata keys
+ // Find import metadata keys
if (dependencyOrder != null) {
for (StartupOrder startupOrder : dependencyOrder) {
for (String startupOrderComponent : startupOrder.getStartupOrderComponentList()) {
- String[] arrStartUp= startupOrderComponent.split("\\.");
- if(arrStartUp[0].equals("cartridge")) {
- String cartridgeAlias = arrStartUp[1];
+ String[] arrStartUp = startupOrderComponent.split("\\.");
+ if (arrStartUp[0].equals("cartridge")) {
+ String cartridgeAlias = arrStartUp[1];
String dependentCartridgeType = findCartridgeTypeFromAlias(cartridgeContextList, cartridgeAlias);
- if(StringUtils.isBlank(dependentCartridgeType)) {
+ if (StringUtils.isBlank(dependentCartridgeType)) {
throw new RuntimeException(String.format("Could not find dependent cartridge for " +
"cartridge alias: [application] %s [cartridge-alias] %s", appId, cartridgeAlias));
}
Cartridge dependencyCartridge = getCartridge(dependentCartridgeType);
- ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType);
+ ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType);
- if (dataHolder != null) {
- if (!dataHolder.getClusterId().equals(clusterId)) {
- dependencyClusterIDs.add(dataHolder.getClusterId());
- if(dependencyCartridge.getMetadataKeys() != null){
+ if (dataHolder != null) {
+ if (!dataHolder.getClusterId().equals(clusterId)) {
+ dependencyClusterIDs.add(dataHolder.getClusterId());
+ if (dependencyCartridge.getMetadataKeys() != null) {
for (String str : dependencyCartridge.getMetadataKeys()) {
if (!StringUtils.isBlank(str)) {
importMetadataKeys.add(dataHolder.getClusterId().split("\\.")[0] +
@@ -414,31 +416,31 @@ public class DefaultApplicationParser implements ApplicationParser {
}
}
}
- if (!dataHolder.getClusterId().equals(clusterId)) {
- if (startupOrderComponent.equals("cartridge.".concat(cartridgeType))) {
- break;
- }
- }
- }
- }
- }
+ if (!dataHolder.getClusterId().equals(clusterId)) {
+ if (startupOrderComponent.equals("cartridge.".concat(cartridgeType))) {
+ break;
+ }
+ }
+ }
+ }
+ }
}
}
}
String[] arrDependencyClusterIDs = new String[dependencyClusterIDs.size()];
arrDependencyClusterIDs = dependencyClusterIDs.toArray(arrDependencyClusterIDs);
- String[] arrExportMetadata = new String[exportMetadataKeys.size()];
- arrExportMetadata = exportMetadataKeys.toArray(arrExportMetadata);
- String[] arrImportMetadata = new String[importMetadataKeys.size()];
- arrImportMetadata = importMetadataKeys.toArray(arrImportMetadata);
+ String[] arrExportMetadata = new String[exportMetadataKeys.size()];
+ arrExportMetadata = exportMetadataKeys.toArray(arrExportMetadata);
+ String[] arrImportMetadata = new String[importMetadataKeys.size()];
+ arrImportMetadata = importMetadataKeys.toArray(arrImportMetadata);
// Find tenant range of cluster
String tenantRange = AutoscalerUtil.findTenantRange(tenantId, cartridge.getTenantPartitions());
- Boolean isLB=false;
- if(cartridge.getCategory().equals("lb")){
- isLB=true;
- }
+ Boolean isLB = false;
+ if (cartridge.getCategory().equals("lb")) {
+ isLB = true;
+ }
// create and collect this cluster's information
ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridge,
key, tenantId, repoUrl, subscriptionAlias, clusterId, hostname,
@@ -449,7 +451,7 @@ public class DefaultApplicationParser implements ApplicationParser {
appClusterCtxt.setAutoscalePolicyName(subscribableInfoContext.getAutoscalingPolicy());
appClusterCtxt.setProperties(subscribableInfoContext.getProperties());
- if(subscribableInfoContext.getPersistenceContext() != null){
+ if (subscribableInfoContext.getPersistenceContext() != null) {
appClusterCtxt.setPersistenceContext(subscribableInfoContext.getPersistenceContext());
}
this.applicationClusterContexts.add(appClusterCtxt);
@@ -463,13 +465,14 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Find alias of a cartridge by cartridge type
+ *
* @param cartridgeContextList
* @param alias
* @return
*/
private String findCartridgeTypeFromAlias(List<CartridgeContext> cartridgeContextList, String alias) {
- for(CartridgeContext cartridgeContext : cartridgeContextList) {
- if(alias.equals(cartridgeContext.getSubscribableInfoContext().getAlias())) {
+ for (CartridgeContext cartridgeContext : cartridgeContextList) {
+ if (alias.equals(cartridgeContext.getSubscribableInfoContext().getAlias())) {
return cartridgeContext.getType();
}
}
@@ -477,47 +480,47 @@ public class DefaultApplicationParser implements ApplicationParser {
}
private void createClusterDataMap(String applicationId,
- List<CartridgeContext> cartridgeContextList,
- Map<String, ClusterDataHolder> clusterDataMap, Map<String, ClusterDataHolder> clusterDataMapByType)
- throws ApplicationDefinitionException {
- for (CartridgeContext cartridgeContext : cartridgeContextList) {
-
- String cartridgeType = cartridgeContext.getType();
- SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
- String subscriptionAlias = subscribableInfoContext.getAlias();
-
- // check if a cartridge with relevant type is already deployed. else, can't continue
- Cartridge cartridge = getCartridge(cartridgeType);
- if (cartridge == null) {
- handleError("No deployed Cartridge found with type [ " + cartridgeType +
- " ] for Composite Application");
- }
-
- // get hostname and cluster id
- ClusterInformation clusterInfo;
- assert cartridge != null;
- if (cartridge.getMultiTenant()) {
- clusterInfo = new MTClusterInformation();
- } else {
- clusterInfo = new STClusterInformation();
- }
-
- String clusterId = clusterInfo.getClusterId(applicationId, subscriptionAlias, cartridgeType);
- // add relevant information to the map
- ClusterDataHolder clusterDataHolderPerType = new ClusterDataHolder(cartridgeType, clusterId);
- clusterDataHolderPerType.setMinInstances(cartridgeContext.getCartridgeMin());
- clusterDataHolderPerType.setMaxInstances(cartridgeContext.getCartridgeMax());
- clusterDataMapByType.put(cartridgeType, clusterDataHolderPerType);
- // add relevant information to the map
- ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId);
- clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin());
- clusterDataHolder.setMaxInstances(cartridgeContext.getCartridgeMax());
- clusterDataMap.put(subscriptionAlias, clusterDataHolder);
-
- }
- }
-
- /**
+ List<CartridgeContext> cartridgeContextList,
+ Map<String, ClusterDataHolder> clusterDataMap, Map<String, ClusterDataHolder> clusterDataMapByType)
+ throws ApplicationDefinitionException {
+ for (CartridgeContext cartridgeContext : cartridgeContextList) {
+
+ String cartridgeType = cartridgeContext.getType();
+ SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
+ String subscriptionAlias = subscribableInfoContext.getAlias();
+
+ // check if a cartridge with relevant type is already deployed. else, can't continue
+ Cartridge cartridge = getCartridge(cartridgeType);
+ if (cartridge == null) {
+ handleError("No deployed Cartridge found with type [ " + cartridgeType +
+ " ] for Composite Application");
+ }
+
+ // get hostname and cluster id
+ ClusterInformation clusterInfo;
+ assert cartridge != null;
+ if (cartridge.getMultiTenant()) {
+ clusterInfo = new MTClusterInformation();
+ } else {
+ clusterInfo = new STClusterInformation();
+ }
+
+ String clusterId = clusterInfo.getClusterId(applicationId, subscriptionAlias, cartridgeType);
+ // add relevant information to the map
+ ClusterDataHolder clusterDataHolderPerType = new ClusterDataHolder(cartridgeType, clusterId);
+ clusterDataHolderPerType.setMinInstances(cartridgeContext.getCartridgeMin());
+ clusterDataHolderPerType.setMaxInstances(cartridgeContext.getCartridgeMax());
+ clusterDataMapByType.put(cartridgeType, clusterDataHolderPerType);
+ // add relevant information to the map
+ ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId);
+ clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin());
+ clusterDataHolder.setMaxInstances(cartridgeContext.getCartridgeMax());
+ clusterDataMap.put(subscriptionAlias, clusterDataHolder);
+
+ }
+ }
+
+ /**
* Validates terminationBehavior. The terminationBehavior should be one of the following:
* 1. terminate-none
* 2. terminate-dependents
@@ -576,15 +579,16 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Validate cartridge group reference against cartridge group definition
+ *
* @param serviceGroup
* @param group
*/
private void validateCartridgeGroupReference(String applicationId, ServiceGroup serviceGroup, Group group) {
List<String> cartridgeTypes = findCartridgeTypesInServiceGroup(serviceGroup);
- for(String cartridgeType : cartridgeTypes) {
- if(findClusterDataInGroup(group, cartridgeType) == null) {
+ for (String cartridgeType : cartridgeTypes) {
+ if (findClusterDataInGroup(group, cartridgeType) == null) {
throw new RuntimeException(String.format("Cartridge %s not defined in cartridge group: " +
- "[application] %s [cartridge-group-name] %s [cartridge-group-alias] %s",
+ "[application] %s [cartridge-group-name] %s [cartridge-group-alias] %s",
cartridgeType, applicationId, group.getName(), group.getAlias()));
}
}
@@ -592,20 +596,21 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Find cluster data in a group recursively by cartridge type.
+ *
* @param group
* @param cartridgeType
* @return
*/
private ClusterDataHolder findClusterDataInGroup(Group group, String cartridgeType) {
Map<String, ClusterDataHolder> clusterDataForType = group.getClusterDataForType();
- if(clusterDataForType != null) {
+ if (clusterDataForType != null) {
ClusterDataHolder clusterData = clusterDataForType.get(cartridgeType);
- if(clusterData != null) {
+ if (clusterData != null) {
return clusterData;
}
- if(group.getGroups() != null) {
- for(Group childGroup : group.getGroups()) {
+ if (group.getGroups() != null) {
+ for (Group childGroup : group.getGroups()) {
return findClusterDataInGroup(childGroup, cartridgeType);
}
}
@@ -615,20 +620,21 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Find cartridge types available in a service group recursively.
+ *
* @param serviceGroup
* @return
*/
private List<String> findCartridgeTypesInServiceGroup(ServiceGroup serviceGroup) {
List<String> cartridgeTypes = new ArrayList<String>();
- if(serviceGroup.getCartridges() != null) {
- for(String cartridgeType : serviceGroup.getCartridges()) {
+ if (serviceGroup.getCartridges() != null) {
+ for (String cartridgeType : serviceGroup.getCartridges()) {
cartridgeTypes.add(cartridgeType);
}
}
- if(serviceGroup.getGroups() != null) {
- for(ServiceGroup childServiceGroup : serviceGroup.getGroups()) {
+ if (serviceGroup.getGroups() != null) {
+ for (ServiceGroup childServiceGroup : serviceGroup.getGroups()) {
List<String> childCartridgeTypes = findCartridgeTypesInServiceGroup(childServiceGroup);
- for(String cartridgeType : childCartridgeTypes) {
+ for (String cartridgeType : childCartridgeTypes) {
cartridgeTypes.add(cartridgeType);
}
}
@@ -709,20 +715,20 @@ public class DefaultApplicationParser implements ApplicationParser {
setStartUpOrder = ParserUtils.convertStartupOrder(startupOrders, groupCtxt);
dependencyOrder.setStartupOrders(setStartUpOrder);
} else {
- if (log.isDebugEnabled()) {
- String msg = String.format("No start up order defined [group-alias] %s", groupCtxt.getAlias());
- log.debug(msg);
- }
+ if (log.isDebugEnabled()) {
+ String msg = String.format("No start up order defined [group-alias] %s", groupCtxt.getAlias());
+ log.debug(msg);
+ }
}
String[] scaleDependents = getScaleDependentForGroup(groupCtxt.getName(), serviceGroup);
if (scaleDependents != null) {
dependencyOrder.setScalingDependents(ParserUtils.convertScalingDependentList(scaleDependents, groupCtxt));
} else {
- if (log.isDebugEnabled()) {
- String msg = String.format("No scaling dependent defined [group-alias] %s", groupCtxt.getAlias());
- log.debug(msg);
- }
+ if (log.isDebugEnabled()) {
+ String msg = String.format("No scaling dependent defined [group-alias] %s", groupCtxt.getAlias());
+ log.debug(msg);
+ }
}
dependencyOrder.setTerminationBehaviour(getTerminationBehaviour(groupCtxt.getName(), serviceGroup));
@@ -941,10 +947,10 @@ public class DefaultApplicationParser implements ApplicationParser {
// Create text payload
PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridge, subscriptionKey, tenantId, clusterId,
- hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs,exportMetadata,importMetadata);
+ hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs, exportMetadata, importMetadata);
String textPayload = payloadData.toString();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Payload :: " + textPayload);
}
return new ApplicationClusterContext(cartridge.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB, tenantRange, dependencyClustorIDs);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
index 788e08f..8d5233b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
@@ -44,7 +44,7 @@ public class ParserUtils {
return startupOrders;
}
- private static StartupOrder getStartupOrder (String commaSeparatedStartupOrder) throws ApplicationDefinitionException{
+ private static StartupOrder getStartupOrder(String commaSeparatedStartupOrder) throws ApplicationDefinitionException {
List<String> startupOrders = new ArrayList<String>();
for (String startupOrder : Arrays.asList(commaSeparatedStartupOrder.split(","))) {
@@ -71,15 +71,15 @@ public class ParserUtils {
for (String commaSeparatedStartupOrder : startupOrderArr) {
// convertStartupOrder all Startup Orders to aliases-based
List<String> components = Arrays.asList(commaSeparatedStartupOrder.split(","));
- StartupOrder startupOrder=new StartupOrder(components);
- startupOrders.add(startupOrder);
+ StartupOrder startupOrder = new StartupOrder(components);
+ startupOrders.add(startupOrder);
}
return startupOrders;
}
- private static StartupOrder getStartupOrder (List<String> components, GroupContext groupContext)
+ private static StartupOrder getStartupOrder(List<String> components, GroupContext groupContext)
throws ApplicationDefinitionException {
List<String> aliasBasedComponents = new ArrayList<String>();
@@ -131,7 +131,7 @@ public class ParserUtils {
return scalingDependentLists;
}
- private static ScalingDependentList getScalingDependentList (String commaSeparatedScalingDependentList) throws ApplicationDefinitionException{
+ private static ScalingDependentList getScalingDependentList(String commaSeparatedScalingDependentList) throws ApplicationDefinitionException {
List<String> scalingDependentLists = new ArrayList<String>();
for (String scalingDependentList : Arrays.asList(commaSeparatedScalingDependentList.split(","))) {
@@ -160,7 +160,7 @@ public class ParserUtils {
return scalingDependentLists;
}
- private static ScalingDependentList getScalingDependentList (List<String> components, GroupContext groupContext)
+ private static ScalingDependentList getScalingDependentList(List<String> components, GroupContext groupContext)
throws ApplicationDefinitionException {
List<String> aliasBasedComponents = new ArrayList<String>();
@@ -199,7 +199,7 @@ public class ParserUtils {
return new ScalingDependentList(aliasBasedComponents);
}
- private static String getAliasForGroupName (String groupName, GroupContext groupContext) {
+ private static String getAliasForGroupName(String groupName, GroupContext groupContext) {
for (GroupContext groupCtxt : groupContext.getGroupContexts()) {
if (groupName.equals(groupCtxt.getName())) {
@@ -211,7 +211,7 @@ public class ParserUtils {
}
- private static String getAliasForServiceType (String serviceType, GroupContext groupContext) {
+ private static String getAliasForServiceType(String serviceType, GroupContext groupContext) {
for (CartridgeContext subCtxt : groupContext.getCartridgeContexts()) {
if (serviceType.equals(subCtxt.getType())) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
index 9ae3280..89eed10 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
@@ -53,9 +53,9 @@ public class BasicPayloadData implements Serializable {
private String provider;
private String[] dependencyAliases;
private String[] exportingProperties;
- private String[] dependencyClusterIDs;
- private String[] exportMetadataKeys;
- private String[] importMetadataKeys;
+ private String[] dependencyClusterIDs;
+ private String[] exportMetadataKeys;
+ private String[] importMetadataKeys;
protected StringBuilder payloadBuilder;
@@ -63,7 +63,7 @@ public class BasicPayloadData implements Serializable {
}
- public void populatePayload () {
+ public void populatePayload() {
payloadBuilder = new StringBuilder();
@@ -109,25 +109,25 @@ public class BasicPayloadData implements Serializable {
payloadBuilder.append(",");
payloadBuilder.append("PUPPET_ENV=" + System.getProperty("puppet.dns.available"));
payloadBuilder.append(",");
- if(getDependencyAliasesPayloadString() != null){
+ if (getDependencyAliasesPayloadString() != null) {
payloadBuilder.append("DEPENDENCY_ALIASES=" + getDependencyAliasesPayloadString());
}
payloadBuilder.append(",");
- if(getExportingPropertiesPayloadString() != null){
+ if (getExportingPropertiesPayloadString() != null) {
payloadBuilder.append("EXPORTING_PROPERTIES=" + getExportingPropertiesPayloadString());
}
- payloadBuilder.append(",");
- if (getDependencyClusterIDPayloadString() != null) {
- payloadBuilder.append("DEPENDENCY_CLUSTER_IDS=" + getDependencyClusterIDPayloadString());
- }
- payloadBuilder.append(",");
- if (getExportMetadataKeys() != null) {
- payloadBuilder.append("EXPORT_METADATA_KEYS=" + getExportMetadataKeys());
- }
- payloadBuilder.append(",");
- if (getExportMetadataKeys() != null) {
- payloadBuilder.append("IMPORT_METADATA_KEYS=" + getImportMetadataKeys());
- }
+ payloadBuilder.append(",");
+ if (getDependencyClusterIDPayloadString() != null) {
+ payloadBuilder.append("DEPENDENCY_CLUSTER_IDS=" + getDependencyClusterIDPayloadString());
+ }
+ payloadBuilder.append(",");
+ if (getExportMetadataKeys() != null) {
+ payloadBuilder.append("EXPORT_METADATA_KEYS=" + getExportMetadataKeys());
+ }
+ payloadBuilder.append(",");
+ if (getExportMetadataKeys() != null) {
+ payloadBuilder.append("IMPORT_METADATA_KEYS=" + getImportMetadataKeys());
+ }
}
public String getServiceName() {
@@ -202,7 +202,7 @@ public class BasicPayloadData implements Serializable {
this.subscriptionKey = subscriptionKey;
}
- public StringBuilder getPayloadData () {
+ public StringBuilder getPayloadData() {
return payloadBuilder;
}
@@ -287,15 +287,15 @@ public class BasicPayloadData implements Serializable {
this.dependencyAliases = dependencyAliases;
}
- private String getDependencyAliasesPayloadString(){
- if(dependencyAliases == null){
+ private String getDependencyAliasesPayloadString() {
+ if (dependencyAliases == null) {
return null;
}
StringBuilder dependencyAliasesPayload = new StringBuilder();
- for(int i=0; i< dependencyAliases.length; i++){
+ for (int i = 0; i < dependencyAliases.length; i++) {
dependencyAliasesPayload.append(dependencyAliases[i]);
- if(i != dependencyAliases.length -1){
+ if (i != dependencyAliases.length - 1) {
dependencyAliasesPayload.append("|");
}
}
@@ -303,15 +303,15 @@ public class BasicPayloadData implements Serializable {
return dependencyAliasesPayload.toString();
}
- private String getExportingPropertiesPayloadString(){
- if(exportingProperties == null){
+ private String getExportingPropertiesPayloadString() {
+ if (exportingProperties == null) {
return null;
}
StringBuilder exportingPropertiesPayload = new StringBuilder();
- for(int i=0; i< exportingProperties.length; i++){
+ for (int i = 0; i < exportingProperties.length; i++) {
exportingPropertiesPayload.append(exportingProperties[i]);
- if(i != exportingProperties.length -1){
+ if (i != exportingProperties.length - 1) {
exportingPropertiesPayload.append("|");
}
}
@@ -327,65 +327,65 @@ public class BasicPayloadData implements Serializable {
this.exportingProperties = exportingProperties;
}
- public String getDependencyClusterIDPayloadString() {
- if (dependencyClusterIDs == null) {
- return null;
- }
+ public String getDependencyClusterIDPayloadString() {
+ if (dependencyClusterIDs == null) {
+ return null;
+ }
- StringBuilder dependencyClusterIDsPayload = new StringBuilder();
- for (int i = 0; i < dependencyClusterIDs.length; i++) {
- dependencyClusterIDsPayload.append(dependencyClusterIDs[i]);
- if (i != dependencyClusterIDs.length - 1) {
- dependencyClusterIDsPayload.append("|");
- }
- }
- if(StringUtils.isNotBlank(dependencyClusterIDsPayload.toString())) {
+ StringBuilder dependencyClusterIDsPayload = new StringBuilder();
+ for (int i = 0; i < dependencyClusterIDs.length; i++) {
+ dependencyClusterIDsPayload.append(dependencyClusterIDs[i]);
+ if (i != dependencyClusterIDs.length - 1) {
+ dependencyClusterIDsPayload.append("|");
+ }
+ }
+ if (StringUtils.isNotBlank(dependencyClusterIDsPayload.toString())) {
log.debug("Dependency cluster ids: " + dependencyClusterIDsPayload);
}
- return dependencyClusterIDsPayload.toString();
- }
-
- public void setDependencyClusterIDs(String[] dependencyClusterIDs) {
- this.dependencyClusterIDs = dependencyClusterIDs;
- }
-
- public String getExportMetadataKeys() {
- if (exportMetadataKeys == null) {
- return null;
- }
-
- StringBuilder exportMetadataKeysPayload = new StringBuilder();
- for (int i = 0; i < exportMetadataKeys.length; i++) {
- exportMetadataKeysPayload.append(exportMetadataKeys[i]);
- if (i != exportMetadataKeys.length - 1) {
- exportMetadataKeysPayload.append("|");
- }
- }
- log.debug("Dependency Cluster IDs: " + exportMetadataKeysPayload);
- return exportMetadataKeysPayload.toString();
- }
-
- public void setExportMetadataKeys(String[] exportMetadataKeys) {
- this.exportMetadataKeys = exportMetadataKeys;
- }
-
- public String getImportMetadataKeys() {
- if (importMetadataKeys == null) {
- return null;
- }
-
- StringBuilder importMetadataKeysPayload = new StringBuilder();
- for (int i = 0; i < importMetadataKeys.length; i++) {
- importMetadataKeysPayload.append(importMetadataKeys[i]);
- if (i != importMetadataKeys.length - 1) {
- importMetadataKeysPayload.append("|");
- }
- }
- log.debug("Dependency Cluster IDs: " + importMetadataKeysPayload);
- return importMetadataKeysPayload.toString();
- }
-
- public void setImportMetadataKeys(String[] importMetadataKeys) {
- this.importMetadataKeys = importMetadataKeys;
- }
+ return dependencyClusterIDsPayload.toString();
+ }
+
+ public void setDependencyClusterIDs(String[] dependencyClusterIDs) {
+ this.dependencyClusterIDs = dependencyClusterIDs;
+ }
+
+ public String getExportMetadataKeys() {
+ if (exportMetadataKeys == null) {
+ return null;
+ }
+
+ StringBuilder exportMetadataKeysPayload = new StringBuilder();
+ for (int i = 0; i < exportMetadataKeys.length; i++) {
+ exportMetadataKeysPayload.append(exportMetadataKeys[i]);
+ if (i != exportMetadataKeys.length - 1) {
+ exportMetadataKeysPayload.append("|");
+ }
+ }
+ log.debug("Dependency Cluster IDs: " + exportMetadataKeysPayload);
+ return exportMetadataKeysPayload.toString();
+ }
+
+ public void setExportMetadataKeys(String[] exportMetadataKeys) {
+ this.exportMetadataKeys = exportMetadataKeys;
+ }
+
+ public String getImportMetadataKeys() {
+ if (importMetadataKeys == null) {
+ return null;
+ }
+
+ StringBuilder importMetadataKeysPayload = new StringBuilder();
+ for (int i = 0; i < importMetadataKeys.length; i++) {
+ importMetadataKeysPayload.append(importMetadataKeys[i]);
+ if (i != importMetadataKeys.length - 1) {
+ importMetadataKeysPayload.append("|");
+ }
+ }
+ log.debug("Dependency Cluster IDs: " + importMetadataKeysPayload);
+ return importMetadataKeysPayload.toString();
+ }
+
+ public void setImportMetadataKeys(String[] importMetadataKeys) {
+ this.importMetadataKeys = importMetadataKeys;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadData.java
index 963e88b..e363244 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadData.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadData.java
@@ -28,26 +28,27 @@ public abstract class PayloadData implements Serializable {
private BasicPayloadData basicPayloadData;
private Map<String, String> completePayloadMap;
+
public PayloadData(BasicPayloadData basicPayloadData) {
this.setBasicPayloadData(basicPayloadData);
completePayloadMap = new HashMap<String, String>();
}
- public void add (String payloadDataName, String payloadDataValue) {
+ public void add(String payloadDataName, String payloadDataValue) {
completePayloadMap.put(payloadDataName, payloadDataValue);
}
- public StringBuilder getCompletePayloadData () {
+ public StringBuilder getCompletePayloadData() {
//return completePayloadMap;
StringBuilder completePayload = new StringBuilder();
completePayload.append(basicPayloadData.getPayloadData());
- Iterator< String > iter = completePayloadMap.keySet().iterator();
- while(iter.hasNext()) {
+ Iterator<String> iter = completePayloadMap.keySet().iterator();
+ while (iter.hasNext()) {
String key = iter.next();
String val = completePayloadMap.get(key);
- if(completePayload.length() > 0){
+ if (completePayload.length() > 0) {
completePayload.append(",");
}
completePayload.append(key + "=" + val);
@@ -63,7 +64,7 @@ public abstract class PayloadData implements Serializable {
this.basicPayloadData = basicPayloadData;
}
- public String toString () {
+ public String toString() {
return getCompletePayloadData().toString();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadFactory.java
index 9c29713..8f41a4b 100755
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/PayloadFactory.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.autoscaler.applications.payload;
@@ -26,9 +26,9 @@ import org.apache.stratos.autoscaler.exception.application.ApplicationDefinition
public class PayloadFactory {
- private static final String LB_IDENTIFIER = "lb";
- public static final String DATA_IDENTIFIER = "data";
- private static Log log = LogFactory.getLog(PayloadFactory.class);
+ private static final String LB_IDENTIFIER = "lb";
+ public static final String DATA_IDENTIFIER = "data";
+ private static Log log = LogFactory.getLog(PayloadFactory.class);
/**
* Creates and returns a PayloadData instance
@@ -38,7 +38,7 @@ public class PayloadFactory {
* @param basicPayloadData BasicPayloadData instance
* @return Payload subscription
*/
- public static PayloadData getPayloadDataInstance(String cartridgeProvider, String cartridgeType,
+ public static PayloadData getPayloadDataInstance(String cartridgeProvider, String cartridgeType,
BasicPayloadData basicPayloadData)
throws ApplicationDefinitionException {
@@ -47,15 +47,13 @@ public class PayloadFactory {
//TODO: fix after adding the property Category to Cartridge Definition
if (cartridgeProvider.equals(DATA_IDENTIFIER)) {
payloadData = new DataCartridgePayloadData(basicPayloadData);
- }
- else if(cartridgeProvider.equals(LB_IDENTIFIER)){
- payloadData = new LoadBalancerCartridgePayloadData(basicPayloadData);
- }
- else {
+ } else if (cartridgeProvider.equals(LB_IDENTIFIER)) {
+ payloadData = new LoadBalancerCartridgePayloadData(basicPayloadData);
+ } else {
payloadData = new FrameworkCartridgePayloadData(basicPayloadData);
}
- if(payloadData == null) {
+ if (payloadData == null) {
throw new ApplicationDefinitionException("Unable to find matching payload for cartridge type " + cartridgeType +
", provider " + cartridgeProvider);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
index 522dd04..721a948 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
@@ -44,7 +44,7 @@ public class ApplicationClusterContext implements Serializable {
// properties
private Properties properties;
- private String[] dependencyClusterIds;
+ private String[] dependencyClusterIds;
public PersistenceContext getPersistenceContext() {
return persistenceContext;
@@ -56,9 +56,9 @@ public class ApplicationClusterContext implements Serializable {
private PersistenceContext persistenceContext;
- public ApplicationClusterContext (String cartridgeType, String clusterId, String hostName,
- String textPayload, String deploymentPolicyName, boolean isLbCluster,
- String tenantRange, String[] dependencyClusterIds) {
+ public ApplicationClusterContext(String cartridgeType, String clusterId, String hostName,
+ String textPayload, String deploymentPolicyName, boolean isLbCluster,
+ String tenantRange, String[] dependencyClusterIds) {
this.cartridgeType = cartridgeType;
this.clusterId = clusterId;
@@ -66,7 +66,7 @@ public class ApplicationClusterContext implements Serializable {
this.textPayload = textPayload;
this.deploymentPolicyName = deploymentPolicyName;
this.tenantRange = tenantRange;
- this.dependencyClusterIds = dependencyClusterIds;
+ this.dependencyClusterIds = dependencyClusterIds;
}
public String getClusterId() {
@@ -124,7 +124,7 @@ public class ApplicationClusterContext implements Serializable {
public void setTenantRange(String tenantRange) {
this.tenantRange = tenantRange;
}
-
+
public Properties getProperties() {
return properties;
}
@@ -135,29 +135,29 @@ public class ApplicationClusterContext implements Serializable {
public boolean equals(Object other) {
- if(other == null || !(other instanceof ApplicationClusterContext)) {
+ if (other == null || !(other instanceof ApplicationClusterContext)) {
return false;
}
- if(this == other) {
+ if (this == other) {
return true;
}
- ApplicationClusterContext that = (ApplicationClusterContext)other;
+ ApplicationClusterContext that = (ApplicationClusterContext) other;
return this.cartridgeType.equals(that.cartridgeType) &&
this.clusterId.equals(that.clusterId);
}
- public int hashCode () {
+ public int hashCode() {
return this.cartridgeType.hashCode() + this.clusterId.hashCode();
}
- 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;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
index fd92628..7ab87ce 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
@@ -76,7 +76,7 @@ public class ApplicationContext implements Serializable {
public void setComponents(ComponentContext componentContext) {
this.componentContext = componentContext;
}
-
+
public int getTenantId() {
return tenantId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
index 3bf8348..fc84f0b8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
@@ -25,42 +25,42 @@ public class CartridgeContext implements Serializable {
private static final long serialVersionUID = 7782017881026018352L;
- private String type;
- private int cartridgeMin;
- private int cartridgeMax;
- private SubscribableInfoContext subscribableInfoContext;
+ private String type;
+ private int cartridgeMin;
+ private int cartridgeMax;
+ private SubscribableInfoContext subscribableInfoContext;
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public int getCartridgeMin() {
- return cartridgeMin;
- }
+ public int getCartridgeMin() {
+ return cartridgeMin;
+ }
- public void setCartridgeMin(int cartridgeMin) {
- this.cartridgeMin = cartridgeMin;
- }
+ public void setCartridgeMin(int cartridgeMin) {
+ this.cartridgeMin = cartridgeMin;
+ }
- public int getCartridgeMax() {
- return cartridgeMax;
- }
+ public int getCartridgeMax() {
+ return cartridgeMax;
+ }
- public void setCartridgeMax(int cartridgeMax) {
- this.cartridgeMax = cartridgeMax;
- }
+ public void setCartridgeMax(int cartridgeMax) {
+ this.cartridgeMax = cartridgeMax;
+ }
- public SubscribableInfoContext getSubscribableInfoContext() {
- return subscribableInfoContext;
- }
+ public SubscribableInfoContext getSubscribableInfoContext() {
+ return subscribableInfoContext;
+ }
+
+ public void setSubscribableInfoContext(
+ SubscribableInfoContext subscribableInfoContext) {
+ this.subscribableInfoContext = subscribableInfoContext;
+ }
- public void setSubscribableInfoContext(
- SubscribableInfoContext subscribableInfoContext) {
- this.subscribableInfoContext = subscribableInfoContext;
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ComponentContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ComponentContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ComponentContext.java
index eb46aa4..98a0d5d 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ComponentContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ComponentContext.java
@@ -37,16 +37,16 @@ public class ComponentContext implements Serializable {
public void setGroupContexts(GroupContext[] groupContexts) {
this.groupContexts = groupContexts;
}
-
+
public CartridgeContext[] getCartridgeContexts() {
- return cartridgeContexts;
- }
+ return cartridgeContexts;
+ }
- public void setCartridgeContexts(CartridgeContext[] cartridgeContexts) {
- this.cartridgeContexts = cartridgeContexts;
- }
+ public void setCartridgeContexts(CartridgeContext[] cartridgeContexts) {
+ this.cartridgeContexts = cartridgeContexts;
+ }
- public DependencyContext getDependencyContext() {
+ public DependencyContext getDependencyContext() {
return dependencyContext;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/DependencyContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/DependencyContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/DependencyContext.java
index 7cf3c51..9e1fe0b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/DependencyContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/DependencyContext.java
@@ -26,9 +26,9 @@ public class DependencyContext implements Serializable {
private static final long serialVersionUID = 6211713487242343226L;
- private String [] startupOrdersContexts;
+ private String[] startupOrdersContexts;
- private String [] scalingDependents;
+ private String[] scalingDependents;
private String terminationBehaviour;
@@ -40,13 +40,13 @@ public class DependencyContext implements Serializable {
this.terminationBehaviour = terminationBehaviour;
}
- public String [] getStartupOrdersContexts() {
- return startupOrdersContexts;
- }
+ public String[] getStartupOrdersContexts() {
+ return startupOrdersContexts;
+ }
- public void setStartupOrdersContexts(String [] startupOrdersContexts) {
- this.startupOrdersContexts = startupOrdersContexts;
- }
+ public void setStartupOrdersContexts(String[] startupOrdersContexts) {
+ this.startupOrdersContexts = startupOrdersContexts;
+ }
public String[] getScalingDependents() {
return scalingDependents;
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
index f440e11..2f1cd6b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.applications.pojo;
import java.io.Serializable;
-public class GroupContext implements Serializable{
+public class GroupContext implements Serializable {
private static final long serialVersionUID = 1595266728968445926L;
@@ -40,7 +40,7 @@ public class GroupContext implements Serializable{
private boolean isGroupScalingEnabled;
//private String autoscalingPolicy;
-
+
private CartridgeContext[] cartridgeContexts;
//private SubscribableContext[] subscribableContexts;
@@ -120,21 +120,21 @@ public class GroupContext implements Serializable{
this.isGroupScalingEnabled = isGroupScalingEnabled;
}
- public CartridgeContext[] getCartridgeContexts() {
- return cartridgeContexts;
- }
+ public CartridgeContext[] getCartridgeContexts() {
+ return cartridgeContexts;
+ }
- public void setCartridgeContexts(CartridgeContext[] cartridgeContexts) {
- this.cartridgeContexts = cartridgeContexts;
- }
+ public void setCartridgeContexts(CartridgeContext[] cartridgeContexts) {
+ this.cartridgeContexts = cartridgeContexts;
+ }
- public String getDeploymentPolicy() {
+ public String getDeploymentPolicy() {
return deploymentPolicy;
}
public void setDeploymentPolicy(String deploymentPolicy) {
this.deploymentPolicy = deploymentPolicy;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/PersistenceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/PersistenceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/PersistenceContext.java
index a345b37..4febd0f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/PersistenceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/PersistenceContext.java
@@ -21,14 +21,14 @@ package org.apache.stratos.autoscaler.applications.pojo;
import java.io.Serializable;
import java.util.Arrays;
-public class PersistenceContext implements Serializable{
-
- private static final long serialVersionUID = 3455721979991902731L;
+public class PersistenceContext implements Serializable {
+
+ private static final long serialVersionUID = 3455721979991902731L;
private boolean persistanceRequired;
- private VolumeContext[] volumes;
+ private VolumeContext[] volumes;
- public String toString () {
+ public String toString() {
return "Persistence Required: " + isPersistenceRequired();
}
@@ -45,7 +45,7 @@ public class PersistenceContext implements Serializable{
}
public void setVolumes(VolumeContext[] volumes) {
- if(volumes == null) {
+ if (volumes == null) {
this.volumes = new VolumeContext[0];
} else {
this.volumes = Arrays.copyOf(volumes, volumes.length);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
index aa525bc..5d3843e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
@@ -68,7 +68,7 @@ public class SubscribableInfoContext implements Serializable {
public void setDependencyAliases(String[] dependencyAliases) {
this.dependencyAliases = dependencyAliases;
}
-
+
public Properties getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/VolumeContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/VolumeContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/VolumeContext.java
index a51cc2c..9021dd0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/VolumeContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/VolumeContext.java
@@ -25,14 +25,14 @@ public class VolumeContext implements Serializable {
private static final long serialVersionUID = -794601157257089446L;
private String id;
private int size;
- private String device;
- private boolean removeOntermination;
+ private String device;
+ private boolean removeOntermination;
private String mappingPath;
private String iaasType;
private String snapshotId;
private String volumeId;
- public String toString () {
+ public String toString() {
return "Persistence Required: " + ", Size: " + getSize() + ", device: " + getDevice() +
" mapping path : " + mappingPath + " remove on termination " + isRemoveOntermination() + " SnaphotId " + snapshotId;
}
@@ -53,7 +53,9 @@ public class VolumeContext implements Serializable {
this.device = device;
}
- public boolean isRemoveOntermination() {return removeOntermination;}
+ public boolean isRemoveOntermination() {
+ return removeOntermination;
+ }
public void setRemoveOntermination(boolean removeOntermination) {
this.removeOntermination = removeOntermination;
@@ -67,54 +69,54 @@ public class VolumeContext implements Serializable {
this.mappingPath = mappingPath;
}
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.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;
- VolumeContext other = (VolumeContext) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
-
- public String getIaasType() {
- return iaasType;
- }
-
- public void setIaasType(String iaasType) {
- this.iaasType = iaasType;
- }
-
- public String getSnapshotId() {
- return snapshotId;
- }
-
- public void setSnapshotId(String snapshotId) {
- this.snapshotId = snapshotId;
- }
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.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;
+ VolumeContext other = (VolumeContext) obj;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ return true;
+ }
+
+ public String getIaasType() {
+ return iaasType;
+ }
+
+ public void setIaasType(String iaasType) {
+ this.iaasType = iaasType;
+ }
+
+ public String getSnapshotId() {
+ return snapshotId;
+ }
+
+ public void setSnapshotId(String snapshotId) {
+ this.snapshotId = snapshotId;
+ }
public String getVolumeId() {
return volumeId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
index 275f506..ecb07ab 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
@@ -64,6 +64,7 @@ public class ApplicationBuilder {
/**
* Create application clusters in cloud controller and send application created event.
+ *
* @param application
* @param appClusterContexts
*/
@@ -74,9 +75,9 @@ public class ApplicationBuilder {
application.getUniqueIdentifier());
}
CloudControllerClient.getInstance().createApplicationClusters(application.getUniqueIdentifier(),
- appClusterContexts);
+ appClusterContexts);
ApplicationHolder.persistApplication(application);
- ApplicationsEventPublisher.sendApplicationCreatedEvent(application);
+ ApplicationsEventPublisher.sendApplicationCreatedEvent(application);
}
public static ApplicationInstance handleApplicationInstanceCreatedEvent(String appId,
@@ -151,7 +152,7 @@ public class ApplicationBuilder {
public static void handleApplicationInstanceInactivateEvent(String appId, String instanceId) {
if (log.isDebugEnabled()) {
log.debug("Handling application Inactive event: [application-id] " + appId +
- " [instance] " + instanceId);
+ " [instance] " + instanceId);
}
Applications applications = ApplicationHolder.getApplications();
@@ -169,7 +170,7 @@ public class ApplicationBuilder {
//setting the status, persist and publish
application.setStatus(status, instanceId);
updateApplicationMonitor(appId, status, applicationInstance.getNetworkPartitionId(),
- instanceId);
+ instanceId);
ApplicationHolder.persistApplication(application);
ApplicationsEventPublisher.sendApplicationInstanceInactivatedEvent(appId, instanceId);
} else {
@@ -225,14 +226,14 @@ public class ApplicationBuilder {
return;
} else {
// Check whether given application is deployed
- ApplicationContext applicationContext = AutoscalerContext.getInstance().getApplicationContext(appId);
- if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
- log.warn(String.format("Application has been found in the ApplicationsTopology" +
- ": [application-id] %s, Please unDeploy the Application Policy " +
- "before deleting the Application definition.",
- appId));
- return;
- }
+ ApplicationContext applicationContext = AutoscalerContext.getInstance().getApplicationContext(appId);
+ if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
+ log.warn(String.format("Application has been found in the ApplicationsTopology" +
+ ": [application-id] %s, Please unDeploy the Application Policy " +
+ "before deleting the Application definition.",
+ appId));
+ return;
+ }
}
//get cluster data to send in event before deleting the application
@@ -272,12 +273,12 @@ public class ApplicationBuilder {
//setting the status, persist and publish
applicationInstance.setStatus(status);
updateApplicationMonitor(applicationId, status, applicationInstance.getNetworkPartitionId(),
- instanceId);
+ instanceId);
ApplicationMonitor applicationMonitor = AutoscalerContext.getInstance().
getAppMonitor(applicationId);
NetworkPartitionContext networkPartitionContext = applicationMonitor.
getNetworkPartitionContext(applicationInstance.
- getNetworkPartitionId());
+ getNetworkPartitionId());
networkPartitionContext.removeInstanceContext(instanceId);
applicationMonitor.removeInstance(instanceId);
application.removeInstance(instanceId);
@@ -488,7 +489,7 @@ public class ApplicationBuilder {
try {
if (log.isDebugEnabled()) {
log.debug("Handling Group instance creation for the [group]: " + groupId +
- " in the [application] " + appId );
+ " in the [application] " + appId);
}
Applications applications = ApplicationHolder.getApplications();
Application application = applications.getApplication(appId);
@@ -642,17 +643,17 @@ public class ApplicationBuilder {
NetworkPartitionContext context = applicationMonitor.
getNetworkPartitionContext(networkPartitionId);
if (applicationMonitor != null) {
- if(status == ApplicationStatus.Active) {
+ if (status == ApplicationStatus.Active) {
context.movePendingInstanceToActiveInstances(instanceId);
- } else if(status == ApplicationStatus.Terminating) {
+ } else if (status == ApplicationStatus.Terminating) {
applicationMonitor.setTerminating(true);
- if(context.getActiveInstance(instanceId) != null) {
+ if (context.getActiveInstance(instanceId) != null) {
context.moveActiveInstanceToTerminationPendingInstances(instanceId);
- } else if(context.getPendingInstance(instanceId) != null) {
+ } else if (context.getPendingInstance(instanceId) != null) {
context.movePendingInstanceToTerminationPendingInstances(instanceId);
}
- } else if(status == ApplicationStatus.Terminated) {
+ } else if (status == ApplicationStatus.Terminated) {
context.removeTerminationPendingInstance(instanceId);
}
applicationMonitor.setStatus(status, instanceId);
@@ -668,15 +669,15 @@ public class ApplicationBuilder {
GroupMonitor monitor = getGroupMonitor(appId, groupId);
if (monitor != null) {
NetworkPartitionContext context = monitor.getNetworkPartitionContext(networkPartitionId);
- if(status == GroupStatus.Active) {
+ if (status == GroupStatus.Active) {
context.movePendingInstanceToActiveInstances(instanceId);
- } else if(status == GroupStatus.Terminating) {
- if(context.getActiveInstance(instanceId) != null) {
+ } else if (status == GroupStatus.Terminating) {
+ if (context.getActiveInstance(instanceId) != null) {
context.moveActiveInstanceToTerminationPendingInstances(instanceId);
- } else if(context.getPendingInstance(instanceId) != null) {
+ } else if (context.getPendingInstance(instanceId) != null) {
context.movePendingInstanceToTerminationPendingInstances(instanceId);
}
- } else if(status == GroupStatus.Terminated) {
+ } else if (status == GroupStatus.Terminated) {
context.removeTerminationPendingInstance(instanceId);
}
monitor.setStatus(status, instanceId, parentInstanceId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
index 7b93fdb..bd66cd0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
@@ -21,16 +21,16 @@ import java.util.Set;
public class ApplicationsEventPublisher {
private static final Log log = LogFactory.getLog(ApplicationsEventPublisher.class);
- public static void sendCompleteApplicationsEvent (Applications completeApplications) {
+ public static void sendCompleteApplicationsEvent(Applications completeApplications) {
publishEvent(new CompleteApplicationsEvent(completeApplications));
}
- public static void sendApplicationCreatedEvent (Application application) {
+ public static void sendApplicationCreatedEvent(Application application) {
publishEvent(new ApplicationCreatedEvent(application));
}
-
- public static void sendApplicationDeletedEvent (String appId, Set<ClusterDataHolder> clusterData) {
- publishEvent(new ApplicationDeletedEvent(appId, clusterData));
+
+ public static void sendApplicationDeletedEvent(String appId, Set<ClusterDataHolder> clusterData) {
+ publishEvent(new ApplicationDeletedEvent(appId, clusterData));
}
public static void sendApplicationInstanceCreatedEvent(String appId, ApplicationInstance applicationInstance) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
index d242b23..078de21 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
@@ -148,10 +148,10 @@ public class CloudControllerClient {
public synchronized void createApplicationClusters(String appId,
ApplicationClusterContext[] applicationClusterContexts) {
List<org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext> contextDTOs =
- new ArrayList<org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext>();
- if(applicationClusterContexts != null) {
+ new ArrayList<org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext>();
+ if (applicationClusterContexts != null) {
for (ApplicationClusterContext applicationClusterContext : applicationClusterContexts) {
- if(applicationClusterContext != null) {
+ if (applicationClusterContext != null) {
org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext dto =
new org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext();
dto.setClusterId(applicationClusterContext.getClusterId());
@@ -163,7 +163,7 @@ public class CloudControllerClient {
dto.setTextPayload(applicationClusterContext.getTextPayload());
dto.setProperties(AutoscalerUtil.toStubProperties(applicationClusterContext.getProperties()));
dto.setDependencyClusterIds(applicationClusterContext.getDependencyClusterIds());
- if(applicationClusterContext.getPersistenceContext() != null){
+ if (applicationClusterContext.getPersistenceContext() != null) {
dto.setVolumeRequired(true);
dto.setVolumes(convertVolumesToStubVolumes(
applicationClusterContext.getPersistenceContext().getVolumes()));
@@ -191,7 +191,7 @@ public class CloudControllerClient {
private Volume[] convertVolumesToStubVolumes(VolumeContext[] volumeContexts) {
ArrayList<Volume> volumes = new ArrayList<Volume>();
- for(VolumeContext volumeContext : volumeContexts){
+ for (VolumeContext volumeContext : volumeContexts) {
Volume volume = new Volume();
volume.setRemoveOntermination(volumeContext.isRemoveOntermination());
volume.setMappingPath(volumeContext.getMappingPath());
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
index 728e8c6..a8fc2cd 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
@@ -58,7 +58,7 @@ public class IdentityApplicationManagementServiceClient {
public IdentityApplicationManagementServiceClient(String epr) throws AxisFault {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- int autosclaerSocketTimeout = conf.getInt("autoscaler.identity.clientTimeout", 180000);
+ int autosclaerSocketTimeout = conf.getInt("autoscaler.identity.clientTimeout", 180000);
try {
ServerConfiguration serverConfig = CarbonUtils.getServerConfiguration();
String trustStorePath = serverConfig.getFirstProperty("Security.TrustStore.Location");
@@ -86,7 +86,7 @@ public class IdentityApplicationManagementServiceClient {
synchronized (IdentityApplicationManagementServiceClient.class) {
if (serviceClient == null) {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
+ String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT);
String epr = "https://" + hostname + ":" + port + "/" + AutoscalerConstants.IDENTITY_APPLICATION_SERVICE_SFX;
serviceClient = new IdentityApplicationManagementServiceClient(epr);
@@ -102,7 +102,7 @@ public class IdentityApplicationManagementServiceClient {
oAuthApplication = OAuthAdminServiceClient.getServiceClient().getOAuthApplication(appName);
- if(oAuthApplication == null){
+ if (oAuthApplication == null) {
return null;
}
@@ -177,7 +177,7 @@ public class IdentityApplicationManagementServiceClient {
}
public void removeApplication(String appName) throws RemoteException, IdentityApplicationManagementServiceIdentityApplicationManagementException {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Removing application %s", appName));
}
stub.deleteApplication(appName);
@@ -185,18 +185,18 @@ public class IdentityApplicationManagementServiceClient {
private String getIdToken(String compositeAppId, String consumerKey, String consumerSecret) throws OAuthSystemException, OAuthProblemException {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
+ String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT);
String tokenEndpoint = "https://" + hostname + ":" + port + "/" + AutoscalerConstants.TOKEN_ENDPOINT_SFX;
- OAuthClientRequest accessRequest = OAuthClientRequest.tokenLocation(tokenEndpoint)
- .setGrantType(GrantType.CLIENT_CREDENTIALS)
- .setClientId(consumerKey)
- .setClientSecret(consumerSecret)
- .setScope(compositeAppId)
- .buildBodyMessage();
- OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient());
-
- OAuthClientResponse oAuthResponse = oAuthClient.accessToken(accessRequest);
+ OAuthClientRequest accessRequest = OAuthClientRequest.tokenLocation(tokenEndpoint)
+ .setGrantType(GrantType.CLIENT_CREDENTIALS)
+ .setClientId(consumerKey)
+ .setClientSecret(consumerSecret)
+ .setScope(compositeAppId)
+ .buildBodyMessage();
+ OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient());
+
+ OAuthClientResponse oAuthResponse = oAuthClient.accessToken(accessRequest);
return oAuthResponse.getParam(ID_TOKEN);
}
}