Updated Branches: refs/heads/master 03ff87973 -> 644e94b9c
Removing redundant variables in cluster model Signed-off-by: Udara Liyanage <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/644e94b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/644e94b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/644e94b9 Branch: refs/heads/master Commit: 644e94b9c31474c347faa9ddc083aa656c4a6d44 Parents: 03ff879 Author: Melan Nimesh <[email protected]> Authored: Wed Nov 13 11:11:40 2013 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Nov 14 14:06:59 2013 +0530 ---------------------------------------------------------------------- .../messaging/domain/topology/Cluster.java | 43 +++++++------------- 1 file changed, 14 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/644e94b9/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java index 79823d1..36f52f5 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java @@ -29,18 +29,19 @@ import java.util.*; * Key: serviceName, clusterId */ public class Cluster implements Serializable { - private String serviceName; + + private static final long serialVersionUID = -361960242360176077L; + + private String serviceName; private String clusterId; private String hostName; private String tenantRange; private String autoscalePolicyName; + private String haPolicyName; private Cloud cloud; private Region region; private Zone zone; - private float averageRequestsInFlight; - private float requestsInFlightSecondDerivative; - private float requestsInFlightGradient; - + // Key: Member.memberId private Map<String, Member> memberMap; private Properties properties; @@ -139,30 +140,6 @@ public class Cluster implements Serializable { this.autoscalePolicyName = autoscalePolicyName; } - public float getAverageRequestsInFlight() { - return averageRequestsInFlight; - } - - public void setAverageRequestsInFlight(float averageRequestsInFlight) { - this.averageRequestsInFlight = averageRequestsInFlight; - } - - public float getRequestsInFlightSecondDerivative() { - return requestsInFlightSecondDerivative; - } - - public void setRequestsInFlightSecondDerivative(float requestsInFlightSecondDerivative) { - this.requestsInFlightSecondDerivative = requestsInFlightSecondDerivative; - } - - public float getRequestsInFlightGradient() { - return requestsInFlightGradient; - } - - public void setRequestsInFlightGradient(float requestsInFlightGradient) { - this.requestsInFlightGradient = requestsInFlightGradient; - } - public void addMemberToIaasNodeId(Member member) { membertoNodeIdMap.put(member.getIaasNodeId(), member); } @@ -179,5 +156,13 @@ public class Cluster implements Serializable { return this.membertoNodeIdMap.containsKey(iaasNodeId); } + public String getHaPolicyName() { + return haPolicyName; + } + + public void setHaPolicyName(String haPolicyName) { + this.haPolicyName = haPolicyName; + } + }
