refactor with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/156a0faa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/156a0faa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/156a0faa Branch: refs/heads/tenant-isolation Commit: 156a0faa4122b337e9dda4fa4a1077e133d04ab8 Parents: fb769af Author: Gayan Gunarathne <[email protected]> Authored: Thu Jul 16 15:11:40 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Thu Jul 16 15:11:40 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/applications/ClusterInformation.java | 4 ++-- .../autoscaler/applications/MTClusterInformation.java | 8 ++++---- .../autoscaler/applications/STClusterInformation.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/156a0faa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java index ae3b0d3..8c4d1b0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java @@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.applications; public interface ClusterInformation { - public String getClusterId(String applicationId, String alias, String cartridgeType); + public String getClusterId(String applicationUuid, String alias, String cartridgeType); - public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName); + public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName); } http://git-wip-us.apache.org/repos/asf/stratos/blob/156a0faa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java index 598d17b..90c8e50 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java @@ -22,24 +22,24 @@ package org.apache.stratos.autoscaler.applications; public class MTClusterInformation implements ClusterInformation { @Override - public String getClusterId(String applicationId, String alias, String cartridgeType) { + public String getClusterId(String applicationUuid, String alias, String cartridgeType) { if (!ApplicationUtils.isValid(cartridgeType)) { // cannot happen throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]"); } - return applicationId + "." + alias + "." + cartridgeType + ".domain"; + return applicationUuid + "." + alias + "." + cartridgeType + ".domain"; } @Override - public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) { + public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName) { if (!ApplicationUtils.isValid(cartridgeDefinitionHostName)) { // cannot happen throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]"); } - return applicationId + "." + cartridgeDefinitionHostName; + return applicationUuid + "." + cartridgeDefinitionHostName; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/156a0faa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java index 1ed3e2f..76cd9a9 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.applications; public class STClusterInformation implements ClusterInformation { @Override - public String getClusterId(String applicationId, String alias, String cartridgeType) { + public String getClusterId(String applicationUuid, String alias, String cartridgeType) { if (!ApplicationUtils.isValid(alias)) { // cannot happen @@ -34,11 +34,11 @@ public class STClusterInformation implements ClusterInformation { throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]"); } - return applicationId + "." + alias + "." + cartridgeType + ".domain"; + return applicationUuid + "." + alias + "." + cartridgeType + ".domain"; } @Override - public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) { + public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName) { if (!ApplicationUtils.isValid(alias)) { // cannot happen @@ -50,6 +50,6 @@ public class STClusterInformation implements ClusterInformation { throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]"); } - return applicationId + "." + alias + "." + cartridgeDefinitionHostName; + return applicationUuid + "." + alias + "." + cartridgeDefinitionHostName; } }
