Repository: stratos Updated Branches: refs/heads/master b9cd72fb7 -> dbf2dad9e
Renaming partition group to NetworkPartition in rest endpoint Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dbf2dad9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dbf2dad9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dbf2dad9 Branch: refs/heads/master Commit: dbf2dad9ebf8294f52985e6bb0a8e0f8acf7eda1 Parents: b9cd72f Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Nov 30 10:56:07 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Nov 30 10:56:07 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV40.java | 4 +- .../rest/endpoint/api/StratosApiV40Utils.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 5 +-- .../autoscaler/partition/NetworkPartition.java | 36 ++++++++++++++++ .../autoscaler/partition/PartitionGroup.java | 36 ---------------- .../policy/deployment/DeploymentPolicy.java | 12 +++--- .../bean/util/converter/PojoConverter.java | 45 ++++++++++---------- .../stratos/rest/endpoint/mock/MockContext.java | 14 +++--- .../rest/endpoint/mock/StratosApiV40Mock.java | 4 +- 9 files changed, 79 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java index f75b784..98243cd 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40.java @@ -35,7 +35,7 @@ import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean; import org.apache.stratos.rest.endpoint.bean.StratosApiResponse; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; @@ -197,7 +197,7 @@ public class StratosApiV40 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public PartitionGroup[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId) + public NetworkPartition[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { return StratosApiV40Utils.getPartitionGroups(deploymentPolicyId); http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index 6af7b96..2420d3c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -52,7 +52,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.rest.endpoint.bean.StratosApiResponse; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean; @@ -471,7 +471,7 @@ public class StratosApiV40Utils { return PojoConverter.populateDeploymentPolicyPojo(deploymentPolicy); } - public static PartitionGroup[] getPartitionGroups (String deploymentPolicyId) + public static NetworkPartition[] getPartitionGroups (String deploymentPolicyId) throws RestAPIException{ org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = null; http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index ac7efc2..2fd1523 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -66,8 +66,7 @@ import org.apache.stratos.rest.endpoint.bean.ApplicationBean; import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean; import org.apache.stratos.rest.endpoint.bean.GroupBean; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean; @@ -651,7 +650,7 @@ public class StratosApiV41Utils { return PojoConverter.populateDeploymentPolicyPojo(deploymentPolicy); } - public static PartitionGroup[] getPartitionGroups(String deploymentPolicyId) + public static NetworkPartition[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException { org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = null; http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/NetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/NetworkPartition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/NetworkPartition.java new file mode 100644 index 0000000..0950baa --- /dev/null +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/NetworkPartition.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.rest.endpoint.bean.autoscaler.partition; + +import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; + +@XmlRootElement +public class NetworkPartition { + + public String id; + + public String partitionAlgo; + + public boolean activeByDefault; + + //partition Ids + public List<Partition> partition; +} http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java deleted file mode 100644 index 3d9fbc6..0000000 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.rest.endpoint.bean.autoscaler.partition; - -import javax.xml.bind.annotation.XmlRootElement; -import java.util.List; - -@XmlRootElement -public class PartitionGroup { - - public String id; - - public String partitionAlgo; - - public boolean activeByDefault; - - //partition Ids - public List<Partition> partition; -} http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java index 419d295..20cd3e9 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java @@ -21,7 +21,7 @@ package org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import javax.xml.bind.annotation.XmlRootElement; import java.util.List; @@ -36,7 +36,7 @@ public class DeploymentPolicy { private boolean isPublic; //partition groups - private List<PartitionGroup> partitionGroup; + private List<NetworkPartition> networkPartition; //partitions private List<Partition> partition; @@ -65,12 +65,12 @@ public class DeploymentPolicy { this.isPublic = isPublic; } - public List<PartitionGroup> getPartitionGroup() { - return partitionGroup; + public List<NetworkPartition> getNetworkPartition() { + return networkPartition; } - public void setPartitionGroup(List<PartitionGroup> partitionGroup) { - this.partitionGroup = partitionGroup; + public void setNetworkPartition(List<NetworkPartition> networkPartition) { + this.networkPartition = networkPartition; } public List<Partition> getPartition() { http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 1272112..aa80402 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -20,7 +20,6 @@ package org.apache.stratos.rest.endpoint.bean.util.converter; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; import java.util.List; @@ -49,7 +48,7 @@ import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.rest.endpoint.bean.ApplicationBean; import org.apache.stratos.rest.endpoint.bean.GroupBean; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.LoadAverageThresholds; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.LoadThresholds; @@ -381,24 +380,24 @@ public class PojoConverter { deploymentPolicy.setId(deploymentPolicyBean.getId()); deploymentPolicy.setDescription(deploymentPolicyBean.getDescription()); deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic()); - if(deploymentPolicyBean.getPartitionGroup() != null && !deploymentPolicyBean.getPartitionGroup().isEmpty()) { - deploymentPolicy.setPartitionGroups(convertToCCPartitionGroup(deploymentPolicyBean.getPartitionGroup())); + if(deploymentPolicyBean.getNetworkPartition() != null && !deploymentPolicyBean.getNetworkPartition().isEmpty()) { + deploymentPolicy.setPartitionGroups(convertToCCPartitionGroup(deploymentPolicyBean.getNetworkPartition())); } return deploymentPolicy; } - private static org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] convertToCCPartitionGroup(List<PartitionGroup> partitionGroupBeans) { + private static org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] convertToCCPartitionGroup(List<NetworkPartition> networkPartitionBeans) { org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = new - org.apache.stratos.autoscaler.stub.partition.PartitionGroup[partitionGroupBeans.size()]; + org.apache.stratos.autoscaler.stub.partition.PartitionGroup[networkPartitionBeans.size()]; - for (int i = 0; i < partitionGroupBeans.size(); i++) { + for (int i = 0; i < networkPartitionBeans.size(); i++) { org.apache.stratos.autoscaler.stub.partition.PartitionGroup partitionGroup = new org.apache.stratos.autoscaler.stub.partition.PartitionGroup(); - partitionGroup.setId(partitionGroupBeans.get(i).id); - partitionGroup.setPartitionAlgo(partitionGroupBeans.get(i).partitionAlgo); - partitionGroup.setActiveByDefault(partitionGroupBeans.get(i).activeByDefault); + partitionGroup.setId(networkPartitionBeans.get(i).id); + partitionGroup.setPartitionAlgo(networkPartitionBeans.get(i).partitionAlgo); + partitionGroup.setActiveByDefault(networkPartitionBeans.get(i).activeByDefault); //TODO populate partitions according to new policy structure // if (partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) { @@ -669,38 +668,38 @@ public class PojoConverter { return deploymentPolicyBean; } - public static PartitionGroup populatePartitionGroupPojo(org.apache.stratos.autoscaler.stub.partition.PartitionGroup + public static NetworkPartition populatePartitionGroupPojo(org.apache.stratos.autoscaler.stub.partition.PartitionGroup partitionGroup) { - PartitionGroup partitionGroupBean = new PartitionGroup(); + NetworkPartition networkPartitionBean = new NetworkPartition(); if (partitionGroup == null) { - return partitionGroupBean; + return networkPartitionBean; } - partitionGroupBean.id = partitionGroup.getId(); - partitionGroupBean.partitionAlgo = partitionGroup.getPartitionAlgo(); + networkPartitionBean.id = partitionGroup.getId(); + networkPartitionBean.partitionAlgo = partitionGroup.getPartitionAlgo(); // if (partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) { // partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions()); // } - return partitionGroupBean; + return networkPartitionBean; } - public static PartitionGroup[] populatePartitionGroupPojos(org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups) { + public static NetworkPartition[] populatePartitionGroupPojos(org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups) { - PartitionGroup[] partitionGroupsBeans; + NetworkPartition[] networkPartitionGroupsBeans; if (partitionGroups == null) { - partitionGroupsBeans = new PartitionGroup[0]; - return partitionGroupsBeans; + networkPartitionGroupsBeans = new NetworkPartition[0]; + return networkPartitionGroupsBeans; } - partitionGroupsBeans = new PartitionGroup[partitionGroups.length]; + networkPartitionGroupsBeans = new NetworkPartition[partitionGroups.length]; for (int i = 0 ; i < partitionGroups.length ; i ++) { - partitionGroupsBeans[i] = populatePartitionGroupPojo(partitionGroups[i]); + networkPartitionGroupsBeans[i] = populatePartitionGroupPojo(partitionGroups[i]); } - return partitionGroupsBeans; + return networkPartitionGroupsBeans; } private static List<Partition> getPartitionList(org.apache.stratos.cloud.controller.domain.xsd.Partition[] http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index c90f6d4..3532672 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -27,7 +27,7 @@ import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean; import org.apache.stratos.rest.endpoint.bean.StratosApiResponse; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; @@ -632,7 +632,7 @@ public class MockContext { return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getPartition().toArray(new Partition[0]); } - public PartitionGroup[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{ + public NetworkPartition[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{ int tenantId = getTenantId(); if(!deploymentPolicyMap.containsKey(tenantId)){ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){ @@ -642,14 +642,14 @@ public class MockContext { if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId); } - return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getPartitionGroup().toArray(new PartitionGroup[0]); + return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartition().toArray(new NetworkPartition[0]); } } if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId); } - return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getPartitionGroup().toArray(new PartitionGroup[0]); + return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartition().toArray(new NetworkPartition[0]); } public AutoscalePolicy[] getAutoscalePolicies() throws RestAPIException{ @@ -811,9 +811,9 @@ public class MockContext { } Partition[] partitions = null; - for(PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroup()){ - if(partitionGroup.id.equals(partitionGroupId)){ - partitions = partitionGroup.partition.toArray(new Partition[0]); + for(NetworkPartition networkPartition : deploymentPolicy.getNetworkPartition()){ + if(networkPartition.id.equals(partitionGroupId)){ + partitions = networkPartition.partition.toArray(new Partition[0]); } } if(partitions == null){ http://git-wip-us.apache.org/repos/asf/stratos/blob/dbf2dad9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java index 34ddc40..ad821ac 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java @@ -35,7 +35,7 @@ import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean; import org.apache.stratos.rest.endpoint.bean.StratosApiResponse; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; +import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.NetworkPartition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; @@ -363,7 +363,7 @@ public class StratosApiV40Mock { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public PartitionGroup[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId) + public NetworkPartition[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { return MockContext.getInstance().getPartitionGroups(deploymentPolicyId);
