creating token only once per an application
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/de0c431c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/de0c431c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/de0c431c Branch: refs/heads/master Commit: de0c431c9926ff5bc6c64ffd70d73405915cf01a Parents: 7fa3c17 Author: Udara Liyanage <[email protected]> Authored: Fri Dec 19 18:37:07 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 22 14:37:54 2014 +0530 ---------------------------------------------------------------------- .../applications/parser/DefaultApplicationParser.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/de0c431c/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 f5a1f16..e3ae175 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 @@ -60,12 +60,12 @@ import java.util.*; */ public class DefaultApplicationParser implements ApplicationParser { - public static final String TOKEN_PAYLOD_PARAM_NAME = "TOKEN"; private static Log log = LogFactory.getLog(DefaultApplicationParser.class); private Set<ApplicationClusterContext> applicationClusterContexts; private Map<String, Properties> aliasToProperties; private Map<String, SubscribableInfoContext> subscribableInformation = new HashMap<String, SubscribableInfoContext>(); + private String oauthToken; public DefaultApplicationParser () { this.applicationClusterContexts = new HashSet<ApplicationClusterContext>(); @@ -106,6 +106,7 @@ public class DefaultApplicationParser implements ApplicationParser { handleError("Invalid Composite Application Definition, no Subscribable Information specified"); } + oauthToken = createToken(applicationCtxt.getApplicationId()); return buildCompositeAppStructure (applicationCtxt, subscribablesInfo); } @@ -343,7 +344,6 @@ public class DefaultApplicationParser implements ApplicationParser { clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin()); clusterDataHolder.setMaxInstances(cartridgeContext.getCartridgeMax()); clusterDataMap.put(subscriptionAlias, clusterDataHolder); - } @@ -465,7 +465,7 @@ public class DefaultApplicationParser implements ApplicationParser { throws ApplicationDefinitionException { Group group = new Group(appId, groupCtxt.getName(), groupCtxt.getAlias()); - group.setGroupScalingEnabled(isGroupScalingEnabled(groupCtxt.getName(),serviceGroup)); + group.setGroupScalingEnabled(isGroupScalingEnabled(groupCtxt.getName(), serviceGroup)); group.setGroupMinInstances(groupCtxt.getGroupMinInstances()); group.setGroupMaxInstances(groupCtxt.getGroupMaxInstances()); DependencyOrder dependencyOrder = new DependencyOrder(); @@ -696,10 +696,7 @@ public class DefaultApplicationParser implements ApplicationParser { // Create text payload PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridgeInfo, subscriptionKey, tenantId, clusterId, - hostname, repoUrl, alias, null, dependencyAliases, properties); - - String oAuth_token = createToken(appId); - payloadData.add(TOKEN_PAYLOD_PARAM_NAME, oAuth_token); + hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken); String textPayload = payloadData.toString();
