Repository: stratos Updated Branches: refs/heads/master c104eadec -> 0ca32b5a7
Fixing build failures 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/0ca32b5a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0ca32b5a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0ca32b5a Branch: refs/heads/master Commit: 0ca32b5a771962191d4697c4648de15cedccfd52 Parents: c104ead Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Nov 30 01:15:45 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Nov 30 01:15:45 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV40Utils.java | 130 ++++++------ .../rest/endpoint/api/StratosApiV41.java | 96 ++++----- .../rest/endpoint/api/StratosApiV41Utils.java | 206 ++++++++++--------- .../bean/util/converter/PojoConverter.java | 113 +++++----- 4 files changed, 275 insertions(+), 270 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0ca32b5a/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 b6f36f6..6af7b96 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 @@ -24,8 +24,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException; @@ -78,14 +78,14 @@ public class StratosApiV40Utils { public static final String SHOULD_DELETE_VOLUME = "volume.delete.on.unsubscription"; public static final String VOLUME_SIZE = "volume.size.gb"; public static final String DEVICE_NAME = "volume.device.name"; - public static final String TENANT_RANGE_ALL = "*"; + public static final String TENANT_RANGE_ALL = "*"; private static Log log = LogFactory.getLog(StratosApiV40Utils.class); private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager(); private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager(); static StratosApiResponse deployCartridge (CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt, - String userName, String tenantDomain) throws RestAPIException { + String userName, String tenantDomain) throws RestAPIException { log.info("Starting to deploy a Cartridge [type] "+cartridgeDefinitionBean.type); @@ -179,16 +179,16 @@ public class StratosApiV40Utils { org.apache.stratos.cloud.controller.domain.xsd.Partition partition = PojoConverter.convertToCCPartitionPojo(partitionBean); - try { - autoscalerServiceClient.deployPartition(partition); - } catch (RemoteException e) { - log.error(e.getMessage(), e); - throw new RestAPIException(e.getMessage(), e); - } catch (AutoScalerServiceInvalidPartitionExceptionException e) { - String message = e.getFaultMessage().getInvalidPartitionException().getMessage(); - log.error(message, e); - throw new RestAPIException(message, e); - } +// try { +// autoscalerServiceClient.deployPartition(partition); +// } catch (RemoteException e) { +// log.error(e.getMessage(), e); +// throw new RestAPIException(e.getMessage(), e); +// } catch (AutoScalerServiceInvalidPartitionExceptionException e) { +// String message = e.getFaultMessage().getInvalidPartitionException().getMessage(); +// log.error(message, e); +// throw new RestAPIException(message, e); +// } } @@ -274,17 +274,17 @@ public class StratosApiV40Utils { public static Partition[] getAvailablePartitions () throws RestAPIException { - org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partition null; + org.apache.stratos.cloud.controller.domain.xsd.Partition[] partitions = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - try { - partitions = autoscalerServiceClient.getAvailablePartitions(); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } +// try { +// partitions = autoscalerServiceClient.getAvailablePartitions(); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } } return PojoConverter.populatePartitionPojos(partitions); @@ -293,19 +293,20 @@ public class StratosApiV40Utils { public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { - org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionAutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partitions = - autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions for deployment policy id " + - deploymentPolicyId+". Cause: "+e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } + org.apache.stratos.cloud.controller.domain.xsd.Partition[] partitions = null; + AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partitions = +// autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions for deployment policy id " + +// deploymentPolicyId+". Cause: "+e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } return PojoConverter.populatePartitionPojos(partitions); } @@ -313,37 +314,38 @@ public class StratosApiV40Utils { public static Partition[] getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.PartitionceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partitions = - autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + - ", group id " + groupId+". Cause: "+e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } + org.apache.stratos.cloud.controller.domain.xsd.Partition[] partitions = null; + AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partitions = +// autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + +// ", group id " + groupId+". Cause: "+e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } return PojoConverter.populatePartitionPojos(partitions); } public static Partition getPartition (String partitionId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = null; + org.apache.stratos.cloud.controller.domain.xsd.Partition partition = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partition = autoscalerServiceClient.getPartition(partitionId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting partition for id " + partitionId+". Cause: "+e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } +// if (autoscalerServiceClient != null) { +// try { +// partition = autoscalerServiceClient.getPartition(partitionId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting partition for id " + partitionId+". Cause: "+e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } return PojoConverter.populatePartitionPojo(partition); } @@ -1101,7 +1103,7 @@ public class StratosApiV40Utils { * */ static StratosApiResponse deployService(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy, - String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) throws RestAPIException { + String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) throws RestAPIException { log.info("Deploying service.."); try { serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, @@ -1163,8 +1165,8 @@ public class StratosApiV40Utils { } public static StratosApiResponse addSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType, - String subscriptionAlias, - SubscriptionDomainRequest request) + String subscriptionAlias, + SubscriptionDomainRequest request) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); @@ -1245,7 +1247,7 @@ public class StratosApiV40Utils { } public static StratosApiResponse removeSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType, - String subscriptionAlias, String domain) throws RestAPIException { + String subscriptionAlias, String domain) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); cartridgeSubsciptionManager.removeSubscriptionDomain(tenantId, subscriptionAlias, domain); http://git-wip-us.apache.org/repos/asf/stratos/blob/0ca32b5a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 7b6dd19..9dd2725 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -280,37 +280,37 @@ public class StratosApiV41 extends AbstractApi { StratosApiV41Utils.undeployServiceGroupDefinition(groupDefinitionName); return Response.noContent().build(); } - - @GET - @Path("/partitions") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartitions() throws RestAPIException { - return Response.ok().entity(StratosApiV41Utils.getAvailablePartitions()).build(); - } - @POST - @Path("/partitions") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/add/partition") - public Response deployPartition(Partition partition) - throws RestAPIException { - - StratosApiV41Utils.deployPartition(partition); - URI url = uriInfo.getAbsolutePathBuilder().path(partition.id).build(); - return Response.created(url).build(); - } +// @GET +// @Path("/partitions") +// @Produces("application/json") +// @Consumes("application/json") +// @AuthorizationAction("/permission/admin/manage/view/partition") +// public Response getPartitions() throws RestAPIException { +// return Response.ok().entity(StratosApiV41Utils.getAvailablePartitions()).build(); +// } - @GET - @Path("/partitions/{partitionId}") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException { - return Response.ok().entity(StratosApiV41Utils.getPartition(partitionId)).build(); - } +// @POST +// @Path("/partitions") +// @Produces("application/json") +// @Consumes("application/json") +// @AuthorizationAction("/permission/admin/manage/add/partition") +// public Response deployPartition(Partition partition) +// throws RestAPIException { +// +// StratosApiV41Utils.deployPartition(partition); +// URI url = uriInfo.getAbsolutePathBuilder().path(partition.id).build(); +// return Response.created(url).build(); +// } +// +// @GET +// @Path("/partitions/{partitionId}") +// @Produces("application/json") +// @Consumes("application/json") +// @AuthorizationAction("/permission/admin/manage/view/partition") +// public Response getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException { +// return Response.ok().entity(StratosApiV41Utils.getPartition(partitionId)).build(); +// } @POST @Path("/deploymentPolicies") @@ -366,26 +366,26 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(StratosApiV41Utils.getPartitionGroups(deploymentPolicyId)).build(); } - @GET - @Path("/deploymentPolicies/{deploymentPolicyId}/partitionGroup/{partitionGroupId}") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartitionGroup(@PathParam("deploymentPolicyId") String deploymentPolicyId, - @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException { - return Response.ok().entity(StratosApiV41Utils.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId)).build(); - } - - @GET - @Path("/deploymentPolicies/{deploymentPolicyId}/partition") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartitionsOfPolicy(@PathParam("deploymentPolicyId") String deploymentPolicyId) - throws RestAPIException { +// @GET +// @Path("/deploymentPolicies/{deploymentPolicyId}/partitionGroup/{partitionGroupId}") +// @Produces("application/json") +// @Consumes("application/json") +// @AuthorizationAction("/permission/admin/manage/view/partition") +// public Response getPartitionGroup(@PathParam("deploymentPolicyId") String deploymentPolicyId, +// @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException { +// return Response.ok().entity(StratosApiV41Utils.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId)).build(); +// } - return Response.ok().entity(StratosApiV41Utils.getPartitionsOfDeploymentPolicy(deploymentPolicyId)).build(); - } +// @GET +// @Path("/deploymentPolicies/{deploymentPolicyId}/partition") +// @Produces("application/json") +// @Consumes("application/json") +// @AuthorizationAction("/permission/admin/manage/view/partition") +// public Response getPartitionsOfPolicy(@PathParam("deploymentPolicyId") String deploymentPolicyId) +// throws RestAPIException { +// +// return Response.ok().entity(StratosApiV41Utils.getPartitionsOfDeploymentPolicy(deploymentPolicyId)).build(); +// } @GET @Path("/autoscalePolicies") http://git-wip-us.apache.org/repos/asf/stratos/blob/0ca32b5a/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 532789a..ac7efc2 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 @@ -26,10 +26,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.manager.client.AutoscalerServiceClient; @@ -93,7 +93,7 @@ public class StratosApiV41Utils { public static final String VOLUME_SIZE = "volume.size.gb"; public static final String DEVICE_NAME = "volume.device.name"; public static final String VOLUME_ID = "volume.id"; - public static final String TENANT_RANGE_ALL = "*"; + public static final String TENANT_RANGE_ALL = "*"; private static Log log = LogFactory.getLog(StratosApiV41Utils.class); private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager(); @@ -316,29 +316,29 @@ public class StratosApiV41Utils { } - public static void deployPartition(Partition partitionBean) throws RestAPIException { - - //log.info("***** " + cartridgeDefinitionBean.toString() + " *****"); - - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - - org.apache.stratos.cloud.controller.domain.xsd.Partition partition = - PojoConverter.convertToCCPartitionPojo(partitionBean); - - try { - autoscalerServiceClient.deployPartition(partition); - } catch (RemoteException e) { - log.error(e.getMessage(), e); - throw new RestAPIException(e.getMessage(), e); - } catch (AutoScalerServiceInvalidPartitionExceptionException e) { - String message = e.getFaultMessage().getInvalidPartitionException().getMessage(); - log.error(message, e); - throw new RestAPIException(message, e); - } - - } - } +// public static void deployPartition(Partition partitionBean) throws RestAPIException { +// +// //log.info("***** " + cartridgeDefinitionBean.toString() + " *****"); +// +// AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = +// PojoConverter.convertToCCPartitionPojo(partitionBean); +// +// try { +// autoscalerServiceClient.deployPartition(partition); +// } catch (RemoteException e) { +// log.error(e.getMessage(), e); +// throw new RestAPIException(e.getMessage(), e); +// } catch (AutoScalerServiceInvalidPartitionExceptionException e) { +// String message = e.getFaultMessage().getInvalidPartitionException().getMessage(); +// log.error(message, e); +// throw new RestAPIException(message, e); +// } +// +// } +// } public static void deployAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException { @@ -453,81 +453,83 @@ public class StratosApiV41Utils { } } - public static Partition[] getAvailablePartitions() throws RestAPIException { - - org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partition null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partitions = autoscalerServiceClient.getAvailablePartitions(); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } - - return PojoConverter.populatePartitionPojos(partitions); - } - - public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) - throws RestAPIException { - - org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionAutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partitions = - autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions for deployment policy id " + - deploymentPolicyId + ". Cause: " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } - - return PojoConverter.populatePartitionPojos(partitions); - } - - public static Partition[] - getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { - - org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.PartitionceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partitions = - autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + - ", group id " + groupId + ". Cause: " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } - - return PojoConverter.populatePartitionPojos(partitions); - } - - public static Partition getPartition(String partitionId) throws RestAPIException { - - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - if (autoscalerServiceClient != null) { - try { - partition = autoscalerServiceClient.getPartition(partitionId); - - } catch (RemoteException e) { - String errorMsg = "Error while getting partition for id " + partitionId + ". Cause: " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } - } - - return PojoConverter.populatePartitionPojo(partition); - } +// public static Partition[] getAvailablePartitions() throws RestAPIException { +// +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; +// AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partitions = autoscalerServiceClient.getAvailablePartitions(); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } +// +// return PojoConverter.populatePartitionPojos(partitions); +// } +// +// public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) +// throws RestAPIException { +// +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; +// AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partitions = +// autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions for deployment policy id " + +// deploymentPolicyId + ". Cause: " + e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } +// +// return PojoConverter.populatePartitionPojos(partitions); +// } +// +// public static Partition[] +// getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { +// +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; +// AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partitions = +// autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + +// ", group id " + groupId + ". Cause: " + e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } +// +// return PojoConverter.populatePartitionPojos(partitions); +// } +// +// public static Partition getPartition(String partitionId) throws RestAPIException { +// +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = null; +// AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); +// if (autoscalerServiceClient != null) { +// try { +// partition = autoscalerServiceClient.getPartition(partitionId); +// +// } catch (RemoteException e) { +// String errorMsg = "Error while getting partition for id " + partitionId + ". Cause: " + e.getMessage(); +// log.error(errorMsg, e); +// throw new RestAPIException(errorMsg, e); +// } +// } +// +// return PojoConverter.populatePartitionPojo(partition); +// } private static AutoscalerServiceClient getAutoscalerServiceClient() throws RestAPIException { @@ -1854,4 +1856,4 @@ public class StratosApiV41Utils { } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/0ca32b5a/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 17f8bf8..1272112 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 @@ -32,18 +32,9 @@ import org.apache.stratos.autoscaler.applications.pojo.xsd.GroupContext; import org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableInfoContext; import org.apache.stratos.autoscaler.stub.pojo.PropertiesE; import org.apache.stratos.autoscaler.stub.pojo.PropertyE; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Container; -import org.apache.stratos.cloud.controller.stub.pojo.IaasConfig; -import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.NetworkInterface; -import org.apache.stratos.cloud.controller.stub.pojo.NetworkInterfaces; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.PortMapping; +import org.apache.stratos.cloud.controller.domain.xsd.*; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; -import org.apache.stratos.cloud.controller.stub.pojo.ServiceGroup; -import org.apache.stratos.cloud.controller.stub.pojo.Volume; import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; import org.apache.stratos.manager.composite.application.beans.GroupDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; @@ -101,7 +92,7 @@ public class PojoConverter { cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup); cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType); - + //deployment information if (cartridgeDefinitionBean.deployment != null) { cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); @@ -137,20 +128,20 @@ public class PojoConverter { { cartridgeConfig.setExportingProperties(cartridgeDefinitionBean.getExportingProperties()); } - + if (cartridgeDefinitionBean.container != null) { cartridgeConfig.setContainer(getContainer(cartridgeDefinitionBean.container)); } return cartridgeConfig; } - + public static ServiceGroup populateServiceGroupPojo (ServiceGroupDefinition serviceGroupDefinition ) { - ServiceGroup servicegroup = new ServiceGroup(); - - // implement conversion (mostly List -> Array) - - return servicegroup; + ServiceGroup servicegroup = new ServiceGroup(); + + // implement conversion (mostly List -> Array) + + return servicegroup; } @@ -309,8 +300,10 @@ public class PojoConverter { public static org.apache.stratos.cloud.controller.domain.xsd.Partition convertToCCPartitionPojo (Partition partitionBean) { - org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partitionw - org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionartitionBean.id); + org.apache.stratos.cloud.controller.domain.xsd.Partition partition = new + org.apache.stratos.cloud.controller.domain.xsd.Partition(); + + partition.setId(partitionBean.id); partition.setDescription(partitionBean.description); partition.setIsPublic(partitionBean.isPublic); partition.setProvider(partitionBean.provider); @@ -380,7 +373,7 @@ public class PojoConverter { } public static org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy convetToCCDeploymentPolicyPojo(DeploymentPolicy - deploymentPolicyBean) { + deploymentPolicyBean) { org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy deploymentPolicy = new org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy(); @@ -407,9 +400,10 @@ public class PojoConverter { partitionGroup.setPartitionAlgo(partitionGroupBeans.get(i).partitionAlgo); partitionGroup.setActiveByDefault(partitionGroupBeans.get(i).activeByDefault); - if (partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) { - partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partition)); - } + //TODO populate partitions according to new policy structure +// if (partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) { +// partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partition)); +// } partitionGroups[i] = partitionGroup; } @@ -460,17 +454,22 @@ public class PojoConverter { return cluster1; } - private static org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.Partitiont<Partition> partitionList) { + private static org.apache.stratos.cloud.controller.domain.xsd.Partition[] convertToCCPartitionPojos + (List<Partition> partitionList) { - org.apache.stratos.cloud.controller.stub.deployment.partitioorg.apache.stratos.cloud.controller.domain.xsd.Partition.controller.stub.deployment.partition.Partition[parorg.apache.stratos.cloud.controller.domain.xsd.Partition++) { + org.apache.stratos.cloud.controller.domain.xsd.Partition[] partitions = + new org.apache.stratos.cloud.controller.domain.xsd.Partition[partitionList.size()]; + for (int i = 0; i < partitionList.size(); i++) { partitions[i] = convertToCCPartitionPojo(partitionList.get(i)); } return partitions; } - public static Partition[] populatePartitionPojos(org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] - org.apache.stratos.cloud.controller.domain.xsd.Partitiontition[] partitionBeans; + public static Partition[] populatePartitionPojos(org.apache.stratos.cloud.controller.domain.xsd.Partition[] + partitions) { + + Partition[] partitionBeans; if (partitions == null) { partitionBeans = new Partition[0]; return partitionBeans; @@ -483,8 +482,10 @@ public class PojoConverter { return partitionBeans; } - public static Partition populatePartitionPojo(org.apache.stratos.cloud.controller.stub.deployment.partition.Partition - org.apache.stratos.cloud.controller.domain.xsd.Partition = new Partition(); + public static Partition populatePartitionPojo(org.apache.stratos.cloud.controller.domain.xsd.Partition + partition) { + + Partition partitionBeans = new Partition(); if (partition == null) { return partitionBeans; } @@ -503,7 +504,7 @@ public class PojoConverter { return partitionBeans; } - + public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) { List<SubscriptionDomainBean> subscriptionDomainBeans = new ArrayList<SubscriptionDomainBean>(); @@ -547,7 +548,7 @@ public class PojoConverter { } return propertyBeans; } - + private static List<PropertyBean> getPropertyBeans(java.util.Properties properties) { List<PropertyBean> propertyBeans = null; @@ -656,10 +657,10 @@ public class PojoConverter { deploymentPolicyBean.setId(deploymentPolicy.getId()); deploymentPolicyBean.setDescription(deploymentPolicy.getDescription()); deploymentPolicyBean.setPublic(deploymentPolicy.getIsPublic()); - - if (deploymentPolicy.getPartitionGroups() != null && deploymentPolicy.getPartitionGroups().length > 0) { - deploymentPolicyBean.setPartitionGroup(Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getPartitionGroups()))); - } +//TODO populate the Network partition based on new policy structure +// if (deploymentPolicy.getPartitionGroups() != null && deploymentPolicy.getPartitionGroups().length > 0) { +// deploymentPolicyBean.setPartitionGroup(Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getPartitionGroups()))); +// } /*if (deploymentPolicy.getAllPartitions() != null && deploymentPolicy.getAllPartitions().length > 0) { deploymentPolicyBean.partition = Arrays.asList(populatePartitionPojos(deploymentPolicy.getAllPartitions())); @@ -678,9 +679,9 @@ public class PojoConverter { partitionGroupBean.id = partitionGroup.getId(); partitionGroupBean.partitionAlgo = partitionGroup.getPartitionAlgo(); - if (partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) { - partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions()); - } +// if (partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) { +// partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions()); +// } return partitionGroupBean; } @@ -702,7 +703,7 @@ public class PojoConverter { return partitionGroupsBeans; } - private static List<Partition> getPartitionList(org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] + private static List<Partition> getPartitionList(org.apache.stratos.cloud.controller.domain.xsd.Partition[] partitions) { List<Partition> partitionList = new ArrayList<Partition>(); @@ -908,7 +909,7 @@ public class PojoConverter { portRangeBean.setLower(portRange.getLower()); return portRangeBean; } - + public static ApplicationContext convertApplicationBeanToApplicationContext (ApplicationDefinition compositeAppDefinition) { org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext applicationContext = @@ -961,14 +962,14 @@ public class PojoConverter { subscribableInfoContext.setRepoPassword(subscribableInfo.getRepoPassword()); subscribableInfoContext.setDependencyAliases(subscribableInfo.getDependencyAliases()); if (subscribableInfo.getProperty() != null) { - org.apache.stratos.cloud.controller.stub.pojo.Properties properties = new Properties(); - for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : subscribableInfo.getProperty()) { - Property property = new Property(); - property.setName(propertyBean.getName()); - property.setValue(propertyBean.getValue()); - properties.addProperties(property); - } - subscribableInfoContext.setProperties(properties); + org.apache.stratos.cloud.controller.stub.pojo.Properties properties = new Properties(); + for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : subscribableInfo.getProperty()) { + Property property = new Property(); + property.setName(propertyBean.getName()); + property.setValue(propertyBean.getValue()); + properties.addProperties(property); + } + subscribableInfoContext.setProperties(properties); } subscribableInfoContexts[i++] = subscribableInfoContext; } @@ -979,18 +980,18 @@ public class PojoConverter { DependencyContext dependencyContext = new DependencyContext(); dependencyContext.setTerminationBehaviour(dependencyDefinitions.getTerminationBehaviour()); - + if (dependencyDefinitions != null && dependencyDefinitions.getStartupOrders() != null) { - String [] startupOrders = new String [dependencyDefinitions.getStartupOrders().size()]; - startupOrders = dependencyDefinitions.getStartupOrders().toArray(startupOrders); - dependencyContext.setStartupOrdersContexts(startupOrders); + String [] startupOrders = new String [dependencyDefinitions.getStartupOrders().size()]; + startupOrders = dependencyDefinitions.getStartupOrders().toArray(startupOrders); + dependencyContext.setStartupOrdersContexts(startupOrders); } return dependencyContext; } private static org.apache.stratos.autoscaler.applications.pojo.xsd.GroupContext[] - getgroupContextArrayFromGroupDefinitions (List<GroupDefinition> groupDefinitions) { + getgroupContextArrayFromGroupDefinitions (List<GroupDefinition> groupDefinitions) { GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()]; int i = 0; @@ -1020,7 +1021,7 @@ public class PojoConverter { } private static org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext [] - getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) { + getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) { org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext[] subscribableContexts = new org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext[subscribableDefinitions.size()]; @@ -1062,5 +1063,5 @@ public class PojoConverter { groupBean.setAutoScalingPolicy(group.getAutoscalingPolicy()); return groupBean; } - + }
