Adding an interface to the AutoScalerService impl
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/63c5c1c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/63c5c1c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/63c5c1c1 Branch: refs/heads/master Commit: 63c5c1c1457b3217e526decc9c79d33098f32750 Parents: 7d8da1d Author: Udara Liyanage <[email protected]> Authored: Mon Dec 2 10:25:55 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 2 10:25:55 2013 -0500 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 17 ++++++++--------- .../interfaces/AutoScalerServiceInterface.java | 13 +++++++++++++ .../autoscaler/partition/PartitionManager.java | 3 +-- 3 files changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/63c5c1c1/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 e4769da..95acb43 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,11 +18,10 @@ */ package org.apache.stratos.autoscaler.api; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; +import org.apache.stratos.autoscaler.interfaces.AutoScalerServiceInterface; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; @@ -31,20 +30,20 @@ import org.apache.stratos.cloud.controller.deployment.partition.Partition; /** * Auto Scaler Service API is responsible getting Partitions and Policies. */ -public class AutoScalerServiceImpl { +public class AutoScalerServiceImpl implements AutoScalerServiceInterface{ private static final Log log = LogFactory.getLog(AutoScalerServiceImpl.class); - public List<Partition> getAllAvailablePartitions(){ - return PartitionManager.getInstance().getAllPartitions(); + public Partition[] getAllAvailablePartitions(){ + return PartitionManager.getInstance().getAllPartitions().toArray(new Partition[0]); } - public List<DeploymentPolicy> getAllDeploymentPolicies(){ - return PolicyManager.getInstance().getDeploymentPolicyList(); + public DeploymentPolicy[] getAllDeploymentPolicies(){ + return PolicyManager.getInstance().getDeploymentPolicyList().toArray(new DeploymentPolicy[0]); } - public List<AutoscalePolicy> getAllAutoScalingPolicy(){ - return PolicyManager.getInstance().getAutoscalePolicyList(); + public AutoscalePolicy[] getAllAutoScalingPolicy(){ + return PolicyManager.getInstance().getAutoscalePolicyList().toArray(new AutoscalePolicy[0]); } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/63c5c1c1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java new file mode 100644 index 0000000..dd6eb42 --- /dev/null +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java @@ -0,0 +1,13 @@ +package org.apache.stratos.autoscaler.interfaces; + +import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; +import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; +import org.apache.stratos.cloud.controller.deployment.partition.Partition; + +public interface AutoScalerServiceInterface { + public Partition[] getAllAvailablePartitions(); + + public DeploymentPolicy[] getAllDeploymentPolicies(); + + public AutoscalePolicy[] getAllAutoScalingPolicy(); +} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/63c5c1c1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java index 96304ec..d19c4ec 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java @@ -27,9 +27,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.exception.InvalidPartitionException; /** * The model class for managing Partitions. @@ -79,6 +77,7 @@ private static final Log log = LogFactory.getLog(PartitionManager.class); public List<Partition> getAllPartitions(){ return Collections.unmodifiableList(new ArrayList<Partition>(partitionListMap.values())); + } }
