Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 077fb4073 -> 305b287b7
overriding hashcode and equals Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/305b287b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/305b287b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/305b287b Branch: refs/heads/4.0.0-grouping Commit: 305b287b78ddaa0e13424eea4dd5eb8b400090a4 Parents: 077fb40 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Sep 24 13:26:11 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Sep 24 13:26:11 2014 +0530 ---------------------------------------------------------------------- .../application/ApplicationUtils.java | 2 +- .../pojo/ApplicationClusterContext.java | 21 ++++++++++++++++++++ .../controller/pojo/payload/MetaDataHolder.java | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/305b287b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java index 8559e00..8783839 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java @@ -78,7 +78,7 @@ public class ApplicationUtils { if (groupName != null) { metaDataHolder = new MetaDataHolder(appId, groupName, clusterId); } else { - metaDataHolder = new MetaDataHolder(appId); + metaDataHolder = new MetaDataHolder(appId, clusterId); } Properties clusterLevelPayloadProperties = new Properties(); http://git-wip-us.apache.org/repos/asf/stratos/blob/305b287b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java index fb37d99..8fa9fee 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java @@ -113,4 +113,25 @@ public class ApplicationClusterContext { public void setTenantRange(String tenantRange) { this.tenantRange = tenantRange; } + + public boolean equals(Object other) { + + if(other == null || !(other instanceof ApplicationClusterContext)) { + return false; + } + + if(this == other) { + return true; + } + + ApplicationClusterContext that = (ApplicationClusterContext)other; + + return this.cartridgeType.equals(that.cartridgeType) && + this.clusterId.equals(that.clusterId); + } + + public int hashCode () { + return this.cartridgeType.hashCode() + this.clusterId.hashCode(); + } + } http://git-wip-us.apache.org/repos/asf/stratos/blob/305b287b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java index 59bf380..3db9f71 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java @@ -35,9 +35,10 @@ public class MetaDataHolder { private Properties properties; - public MetaDataHolder (String appId) { + public MetaDataHolder (String appId, String clusterId) { this.appId = appId; + this.clusterId = clusterId; } public MetaDataHolder(String appId, String groupName, String clusterId) {
