Updated Branches: refs/heads/master ef07f2b14 -> 664c09845
change return types of getAllDeploymentPolicies and getAllAutoScalingPolicy. Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/664c0984 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/664c0984 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/664c0984 Branch: refs/heads/master Commit: 664c098458d734fa2febcb5934db31bb0e65ae73 Parents: ef07f2b Author: Udara Liyanage <[email protected]> Authored: Tue Dec 17 09:15:45 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 17 09:15:45 2013 -0500 ---------------------------------------------------------------------- .../stratos/autoscaler/api/AutoScalerServiceImpl.java | 9 ++++----- .../apache/stratos/autoscaler/policy/PolicyManager.java | 12 ++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/664c0984/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index ce5292e..e395f53 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -18,12 +18,13 @@ */ package org.apache.stratos.autoscaler.api; +import java.util.ArrayList; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.NetworkPartitionContext; import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; -import org.apache.stratos.autoscaler.exception.AutoScalerException; import org.apache.stratos.autoscaler.exception.InvalidPartitionException; import org.apache.stratos.autoscaler.exception.InvalidPolicyException; import org.apache.stratos.autoscaler.exception.NonExistingLBException; @@ -35,8 +36,6 @@ import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.deployment.partition.Partition; -import java.util.ArrayList; - /** * Auto Scaler Service API is responsible getting Partitions and Policies. */ @@ -50,11 +49,11 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface{ } public DeploymentPolicy[] getAllDeploymentPolicies(){ - return PolicyManager.getInstance().getDeploymentPolicyList().toArray(new DeploymentPolicy[0]); + return PolicyManager.getInstance().getDeploymentPolicyList(); } public AutoscalePolicy[] getAllAutoScalingPolicy(){ - return PolicyManager.getInstance().getAutoscalePolicyList().toArray(new AutoscalePolicy[0]); + return PolicyManager.getInstance().getAutoscalePolicyList(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/664c0984/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java index b766383..66c91d5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java @@ -154,12 +154,12 @@ public class PolicyManager { } /** - * Returns a List of the Autoscale policies contained in this manager. + * Returns an array of the Autoscale policies contained in this manager. * * @return */ - public List<AutoscalePolicy> getAutoscalePolicyList() { - return Collections.unmodifiableList(new ArrayList<AutoscalePolicy>(autoscalePolicyListMap.values())); + public AutoscalePolicy[] getAutoscalePolicyList() { + return autoscalePolicyListMap.values().toArray(new AutoscalePolicy[0]); } /** @@ -210,12 +210,12 @@ public class PolicyManager { } /** - * Returns a List of the Deployment policies contained in this manager. + * Returns an array of the Deployment policies contained in this manager. * * @return */ - public List<DeploymentPolicy> getDeploymentPolicyList() { - return Collections.unmodifiableList(new ArrayList<DeploymentPolicy>(deploymentPolicyListMap.values())); + public DeploymentPolicy[] getDeploymentPolicyList() { + return deploymentPolicyListMap.values().toArray(new DeploymentPolicy[0]); } /**
