Removing lowerLimit at client side
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/62ff2f02 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/62ff2f02 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/62ff2f02 Branch: refs/heads/master Commit: 62ff2f02b11d8d5070c895e3e43a9a16ea0dd103 Parents: ebb4dc7 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Dec 19 16:48:33 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Dec 19 16:48:33 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/policy/autoscale/LoadAverageThresholds.java | 9 --------- .../policy/autoscale/MemoryConsumptionThresholds.java | 8 -------- .../policy/autoscale/RequestsInFlightThresholds.java | 8 -------- .../rest/endpoint/util/converter/ObjectConverter.java | 6 ------ 4 files changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java index 9919137..ead0106 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement; public class LoadAverageThresholds { private float threshold; - private float lowerLimit; public float getThreshold() { return threshold; @@ -34,12 +33,4 @@ public class LoadAverageThresholds { public void setThreshold(float threshold) { this.threshold = threshold; } - - public float getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(float lowerLimit) { - this.lowerLimit = lowerLimit; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java index 431700b..6eec829 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement; public class MemoryConsumptionThresholds { private float threshold; - private float lowerLimit; public float getThreshold() { return threshold; @@ -35,11 +34,4 @@ public class MemoryConsumptionThresholds { this.threshold = threshold; } - public float getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(float lowerLimit) { - this.lowerLimit = lowerLimit; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java index 64bf721..0232174 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement; public class RequestsInFlightThresholds { private float threshold; - private float lowerLimit; public float getThreshold() { return threshold; @@ -35,11 +34,4 @@ public class RequestsInFlightThresholds { this.threshold = threshold; } - public float getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(float lowerLimit) { - this.lowerLimit = lowerLimit; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/62ff2f02/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 1bf1398..b5a7d5d 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -344,7 +344,6 @@ public class ObjectConverter { org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds loadAverage = new org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds(); loadAverage.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getLoadAverage().getThreshold()); - loadAverage.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getLoadAverage().getLowerLimit()); //set load average loadThresholds.setLoadAverage(loadAverage); } @@ -354,7 +353,6 @@ public class ObjectConverter { org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds(); //set request in flight information requestsInFlight.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getRequestsInFlight().getThreshold()); - requestsInFlight.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getRequestsInFlight().getLowerLimit()); //set request in flight loadThresholds.setRequestsInFlight(requestsInFlight); } @@ -365,7 +363,6 @@ public class ObjectConverter { //set memory consumption information memoryConsumption.setUpperLimit(autoscalePolicyBean.getLoadThresholds().getMemoryConsumption().getThreshold()); - memoryConsumption.setLowerLimit(autoscalePolicyBean.getLoadThresholds().getMemoryConsumption().getLowerLimit()); //set memory consumption loadThresholds.setMemoryConsumption(memoryConsumption); } @@ -806,19 +803,16 @@ public class ObjectConverter { if (loadThresholds.getLoadAverage() != null) { LoadAverageThresholds loadAverage = new LoadAverageThresholds(); loadAverage.setThreshold(loadThresholds.getLoadAverage().getUpperLimit()); - loadAverage.setLowerLimit(loadThresholds.getLoadAverage().getLowerLimit()); loadThresholdBean.setLoadAverage(loadAverage); } if (loadThresholds.getMemoryConsumption() != null) { MemoryConsumptionThresholds memoryConsumption = new MemoryConsumptionThresholds(); memoryConsumption.setThreshold(loadThresholds.getMemoryConsumption().getUpperLimit()); - memoryConsumption.setLowerLimit(loadThresholds.getMemoryConsumption().getLowerLimit()); loadThresholdBean.setMemoryConsumption(memoryConsumption); } if (loadThresholds.getRequestsInFlight() != null) { RequestsInFlightThresholds requestsInFlight = new RequestsInFlightThresholds(); requestsInFlight.setThreshold(loadThresholds.getRequestsInFlight().getUpperLimit()); - requestsInFlight.setLowerLimit(loadThresholds.getRequestsInFlight().getLowerLimit()); loadThresholdBean.setRequestsInFlight(requestsInFlight); }
