Repository: stratos Updated Branches: refs/heads/master f7d858533 -> 830785f1c
Fixing rest endpoint build failures Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/830785f1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/830785f1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/830785f1 Branch: refs/heads/master Commit: 830785f1c390f2290573c2480676c7d26ac52171 Parents: f7d8585 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Nov 30 18:34:27 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Nov 30 18:34:27 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV40Utils.java | 7 ++++--- .../rest/endpoint/api/StratosApiV41Utils.java | 7 ++++--- .../bean/util/converter/PojoConverter.java | 22 +++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/830785f1/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 e1cfa99..e0f1413 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 @@ -23,6 +23,7 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig; import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; @@ -473,11 +474,11 @@ public class StratosApiV40Utils { public static NetworkPartition[] getPartitionGroups (String deploymentPolicyId) throws RestAPIException{ - org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = null; + ApplicationLevelNetworkPartition[] applicationLevelNetworkPartitions = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { - partitionGroups = autoscalerServiceClient.getApplicationLevelNetworkPartition(deploymentPolicyId); + applicationLevelNetworkPartitions = autoscalerServiceClient.getApplicationLevelNetworkPartition(deploymentPolicyId); } catch (RemoteException e) { String errorMsg = "Error getting available partition groups for deployment policy id " @@ -487,7 +488,7 @@ public class StratosApiV40Utils { } } - return PojoConverter.populatePartitionGroupPojos(partitionGroups); + return PojoConverter.populatePartitionGroupPojos(applicationLevelNetworkPartitions); } static Cartridge getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException { http://git-wip-us.apache.org/repos/asf/stratos/blob/830785f1/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 129a1ed..9f74872 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 @@ -23,6 +23,7 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition; import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; @@ -172,12 +173,12 @@ public class StratosApiV41Utils { applicationContext.setTeantAdminUsername(userName); if (appDefinition.getProperty() != null) { - org.apache.stratos.cloud.controller.stub.pojo.Properties properties = new Properties(); + org.apache.stratos.common.Properties properties = new org.apache.stratos.common.Properties(); for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : appDefinition.getProperty()) { Property property = new Property(); property.setName(propertyBean.getName()); property.setValue(propertyBean.getValue()); - properties.addProperties(property); + properties.addProperty(property); } applicationContext.setProperties(properties); } @@ -653,7 +654,7 @@ public class StratosApiV41Utils { public static NetworkPartition[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException { - org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = null; + ApplicationLevelNetworkPartition[] partitionGroups = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/830785f1/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 ba7f958..05e8f9e 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 @@ -25,6 +25,7 @@ import java.util.Enumeration; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition; import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.DependencyContext; import org.apache.stratos.autoscaler.stub.pojo.GroupContext; @@ -379,22 +380,22 @@ public class PojoConverter { deploymentPolicy.setDescription(deploymentPolicyBean.getDescription()); deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic()); if(deploymentPolicyBean.getNetworkPartition() != null && !deploymentPolicyBean.getNetworkPartition().isEmpty()) { - deploymentPolicy.setPartitionGroups(convertToCCPartitionGroup(deploymentPolicyBean.getNetworkPartition())); + deploymentPolicy.setApplicationLevelNetworkPartitions(convertToCCPartitionGroup(deploymentPolicyBean.getNetworkPartition())); } return deploymentPolicy; } - private static org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] convertToCCPartitionGroup(List<NetworkPartition> networkPartitionBeans) { + private static ApplicationLevelNetworkPartition[] convertToCCPartitionGroup(List<NetworkPartition> networkPartitionBeans) { - org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups = new - org.apache.stratos.autoscaler.stub.partition.PartitionGroup[networkPartitionBeans.size()]; + ApplicationLevelNetworkPartition[] partitionGroups = new + ApplicationLevelNetworkPartition[networkPartitionBeans.size()]; for (int i = 0; i < networkPartitionBeans.size(); i++) { - org.apache.stratos.autoscaler.stub.partition.PartitionGroup partitionGroup = new - org.apache.stratos.autoscaler.stub.partition.PartitionGroup(); + ApplicationLevelNetworkPartition partitionGroup = new + ApplicationLevelNetworkPartition(); partitionGroup.setId(networkPartitionBeans.get(i).id); - partitionGroup.setPartitionAlgo(networkPartitionBeans.get(i).partitionAlgo); +// partitionGroup.setPartitionAlgo(networkPartitionBeans.get(i).partitionAlgo); partitionGroup.setActiveByDefault(networkPartitionBeans.get(i).activeByDefault); //TODO populate partitions according to new policy structure @@ -666,7 +667,7 @@ public class PojoConverter { return deploymentPolicyBean; } - public static NetworkPartition populatePartitionGroupPojo(org.apache.stratos.autoscaler.stub.partition.PartitionGroup + public static NetworkPartition populatePartitionGroupPojo(ApplicationLevelNetworkPartition partitionGroup) { NetworkPartition networkPartitionBean = new NetworkPartition(); @@ -675,7 +676,8 @@ public class PojoConverter { } networkPartitionBean.id = partitionGroup.getId(); - networkPartitionBean.partitionAlgo = partitionGroup.getPartitionAlgo(); + //FIXME update with new deployment policy pattern +// networkPartitionBean.partitionAlgo = partitionGroup.getPartitionAlgo(); // if (partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) { // partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions()); // } @@ -683,7 +685,7 @@ public class PojoConverter { return networkPartitionBean; } - public static NetworkPartition[] populatePartitionGroupPojos(org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] partitionGroups) { + public static NetworkPartition[] populatePartitionGroupPojos(ApplicationLevelNetworkPartition[] partitionGroups) { NetworkPartition[] networkPartitionGroupsBeans; if (partitionGroups == null) {
