You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/10 16:19:38 UTC
[4/8] stratos git commit: Cleaning rest api bean classes
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bf5f947/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 0a8ff5c..13e3578 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
@@ -29,19 +29,18 @@ import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptio
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
+import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
import org.apache.stratos.common.client.AutoscalerServiceClient;
import org.apache.stratos.common.client.CloudControllerServiceClient;
-import org.apache.stratos.common.beans.Cartridge;
import org.apache.stratos.common.client.StratosManagerServiceClient;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.manager.utils.CartridgeConstants;
-import org.apache.stratos.common.beans.StratosApiResponse;
-import org.apache.stratos.common.beans.SubscriptionDomainRequest;
-import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
-import org.apache.stratos.common.beans.autoscaler.partition.Partition;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.common.beans.repositoryNotificationInfoBean.Payload;
+import org.apache.stratos.common.beans.ApiResponseBean;
+import org.apache.stratos.common.beans.partition.ApplicationLevelNetworkPartitionBean;
+import org.apache.stratos.common.beans.partition.PartitionBean;
+import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
import org.apache.stratos.rest.endpoint.util.converter.ObjectConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
@@ -63,7 +62,7 @@ public class StratosApiV40Utils {
private static Log log = LogFactory.getLog(StratosApiV40Utils.class);
- static StratosApiResponse deployCartridge (CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
+ static ApiResponseBean deployCartridge (CartridgeBean cartridgeDefinitionBean, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
log.info("Starting to deploy a Cartridge [type] "+ cartridgeDefinitionBean.getType());
@@ -96,7 +95,7 @@ public class StratosApiV40Utils {
}
}
- StratosApiResponse stratosApiResponse = new StratosApiResponse();
+ ApiResponseBean stratosApiResponse = new ApiResponseBean();
String message = "Successfully added cartridge definition: [cartridge-type] " + cartridgeDefinitionBean.getType();
stratosApiResponse.setMessage(message);
if(log.isInfoEnabled()) {
@@ -125,7 +124,7 @@ public class StratosApiV40Utils {
return commonPolicies.toArray(new DeploymentPolicy[0]);
}
- static StratosApiResponse undeployCartridge(String cartridgeType) throws RestAPIException {
+ static ApiResponseBean undeployCartridge(String cartridgeType) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -142,13 +141,13 @@ public class StratosApiV40Utils {
}
- StratosApiResponse stratosApiResponse = new StratosApiResponse();
+ ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully undeployed cartridge definition with type " + cartridgeType);
return stratosApiResponse;
}
- public static StratosApiResponse deployPartition(Partition partitionBean) throws RestAPIException {
+ public static ApiResponseBean deployPartition(PartitionBean partitionBean) throws RestAPIException {
//log.info("***** " + cartridgeDefinitionBean.toString() + " *****");
@@ -171,12 +170,12 @@ public class StratosApiV40Utils {
}
- StratosApiResponse stratosApiResponse = new StratosApiResponse();
+ ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deployed partition definition with id " + partitionBean.getId());
return stratosApiResponse;
}
- public static StratosApiResponse deployAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
+ public static ApiResponseBean deployAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException {
//log.info("***** " + cartridgeDefinitionBean.toString() + " *****");
@@ -201,7 +200,7 @@ public class StratosApiV40Utils {
}
- StratosApiResponse stratosApiResponse = new StratosApiResponse();
+ ApiResponseBean stratosApiResponse = new ApiResponseBean();
stratosApiResponse.setMessage("Successfully deployed autoscaling policy definition with id " + autoscalePolicyBean.getId());
return stratosApiResponse;
}
@@ -219,7 +218,7 @@ public class StratosApiV40Utils {
}
}
- public static Partition[] getAvailablePartitions () throws RestAPIException {
+ public static PartitionBean[] getAvailablePartitions () throws RestAPIException {
org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -237,7 +236,7 @@ public class StratosApiV40Utils {
return ObjectConverter.populatePartitionPojos(partitions);
}
- public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId)
+ public static PartitionBean[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId)
throws RestAPIException {
org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = null;
@@ -258,7 +257,7 @@ public class StratosApiV40Utils {
return ObjectConverter.populatePartitionPojos(partitions);
}
- public static Partition[]
+ public static PartitionBean[]
getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException {
org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = null;
@@ -279,7 +278,7 @@ public class StratosApiV40Utils {
return ObjectConverter.populatePartitionPojos(partitions);
}
- public static Partition getPartition (String partitionId) throws RestAPIException {
+ public static PartitionBean getPartition (String partitionId) throws RestAPIException {
org.apache.stratos.cloud.controller.stub.domain.Partition partition = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -309,7 +308,7 @@ public class StratosApiV40Utils {
}
}
- public static AutoscalePolicy[] getAutoScalePolicies () throws RestAPIException {
+ public static AutoscalePolicyBean[] getAutoScalePolicies () throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] autoscalePolicies = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -326,7 +325,7 @@ public class StratosApiV40Utils {
return ObjectConverter.convertStubAutoscalePoliciesToAutoscalePolicies(autoscalePolicies);
}
- public static AutoscalePolicy getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException {
+ public static AutoscalePolicyBean getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -345,7 +344,7 @@ public class StratosApiV40Utils {
return ObjectConverter.convertStubAutoscalePolicyToAutoscalePolicy(autoscalePolicy);
}
- public static org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy
+ public static DeploymentPolicyBean
getDeploymentPolicy(String deploymentPolicyId) throws RestAPIException {
DeploymentPolicy deploymentPolicy = null;
@@ -371,7 +370,7 @@ public class StratosApiV40Utils {
return ObjectConverter.convertStubDeploymentPolicyToDeploymentPolicy(deploymentPolicy);
}
- public static ApplicationLevelNetworkPartition[] getPartitionGroups (String deploymentPolicyId)
+ public static ApplicationLevelNetworkPartitionBean[] getPartitionGroups (String deploymentPolicyId)
throws RestAPIException{
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[] applicationLevelNetworkPartitions = null;
@@ -391,10 +390,10 @@ public class StratosApiV40Utils {
return ObjectConverter.convertStubApplicationLevelNetworkPartitionsToApplicationLevelNetworkPartitions(applicationLevelNetworkPartitions);
}
- static Cartridge getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
- for(Cartridge cartridge : cartridges) {
- if(cartridge.getCartridgeType().equals(cartridgeType)) {
+ static CartridgeBean getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
+ for(CartridgeBean cartridge : cartridges) {
+ if(cartridge.getType().equals(cartridgeType)) {
return cartridge;
}
}
@@ -403,13 +402,13 @@ public class StratosApiV40Utils {
throw new RestAPIException(msg) ;
}
- static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant,
+ static List<CartridgeBean> getAvailableLbCartridges(Boolean multiTenant,
ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant,
+ List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant,
configurationContext);
- List<Cartridge> lbCartridges = new ArrayList<Cartridge>();
- for (Cartridge cartridge : cartridges) {
- if (cartridge.isLoadBalancer()) {
+ List<CartridgeBean> lbCartridges = new ArrayList<CartridgeBean>();
+ for (CartridgeBean cartridge : cartridges) {
+ if (cartridge.getCategory().equals("LoadBalancer")) {
lbCartridges.add(cartridge);
}
}
@@ -422,8 +421,8 @@ public class StratosApiV40Utils {
return lbCartridges;
}
- static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = new ArrayList<Cartridge>();
+ static List<CartridgeBean> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
if (log.isDebugEnabled()) {
log.debug("Getting available cartridges. Search String: " + cartridgeSearchString + ", Multi-Tenant: " + multiTenant);
@@ -468,25 +467,25 @@ public class StratosApiV40Utils {
continue;
}
- Cartridge cartridge = new Cartridge();
- cartridge.setCartridgeType(cartridgeType);
+ CartridgeBean cartridge = new CartridgeBean();
+ cartridge.setType(cartridgeType);
cartridge.setProvider(cartridgeInfo.getProvider());
cartridge.setDisplayName(cartridgeInfo.getDisplayName());
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setVersion(cartridgeInfo.getVersion());
cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
- cartridge.setHostName(cartridgeInfo.getHostName());
+ cartridge.setHost(cartridgeInfo.getHostName());
cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy());
cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy());
//cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED);
- cartridge.setCartridgeAlias("-");
- cartridge.setPersistence(ObjectConverter.convertStubPersistenceToPersistence(cartridgeInfo.getPersistence()));
+ //cartridge.setCartridgeAlias("-");
+ //cartridge.setPersistence(ObjectConverter.convertStubPersistenceToPersistence(cartridgeInfo.getPersistence()));
cartridge.setServiceGroup(cartridgeInfo.getServiceGroup());
if(cartridgeInfo.getLbConfig() != null && cartridgeInfo.getProperties() != null) {
for(org.apache.stratos.cloud.controller.stub.Property property: cartridgeInfo.getProperties()) {
if(property.getName().equals("load.balancer")) {
- cartridge.setLoadBalancer(true);
+ //cartridge.setLoadBalancer(true);
}
}
}
@@ -518,7 +517,7 @@ public class StratosApiV40Utils {
throw new RestAPIException(msg, e);
}
- Collections.sort(cartridges);
+ //Collections.sort(cartridges);
if (log.isDebugEnabled()) {
log.debug("Returning available cartridges " + cartridges.size());
@@ -972,27 +971,11 @@ public class StratosApiV40Utils {
return cartridgeSubscription.getClusterDomain();
} */
- static StratosApiResponse unsubscribe(String alias, String tenantDomain) throws RestAPIException {
-
+ static ApiResponseBean unsubscribe(String alias, String tenantDomain) throws RestAPIException {
throw new RestAPIException("Not implemented");
-// try {
-// cartridgeSubsciptionManager.unsubscribeFromCartridge(tenantDomain, alias);
-// } catch (ADCException e) {
-// String msg = "Failed to unsubscribe from [alias] "+alias+". Cause: "+ e.getMessage();
-// log.error(msg, e);
-// throw new RestAPIException(msg, e);
-//
-// } catch (NotSubscribedException e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-//
-// StratosApiResponse stratosApiResponse = new StratosApiResponse();
-// stratosApiResponse.setMessage("Successfully terminated the subscription with alias " + alias);
-// return stratosApiResponse;
}
- static void notifyArtifactUpdatedEvent(Payload payload) throws RestAPIException {
+ static void notifyArtifactUpdatedEvent(GitNotificationPayloadBean payload) throws RestAPIException {
try {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.notifyArtifactUpdatedEventForRepository(payload.getRepository().getUrl());
@@ -1003,103 +986,8 @@ public class StratosApiV40Utils {
}
}
- public static StratosApiResponse addSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType,
- String subscriptionAlias,
- SubscriptionDomainRequest request)
- throws RestAPIException {
-// try {
-// int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
-//
-// for (org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean subscriptionDomain : request.getDomains()) {
-// boolean isDomainExists = isSubscriptionDomainExists(configurationContext, cartridgeType, subscriptionAlias, subscriptionDomain.getDomainName());
-// if (isDomainExists) {
-// String message = "Subscription domain " + subscriptionDomain.getDomainName() + " exists";
-// throw new RestAPIException(Status.INTERNAL_SERVER_ERROR, message);
-// }
-// }
-//
-// for (org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean subscriptionDomain : request.getDomains()) {
-// cartridgeSubsciptionManager.addSubscriptionDomain(tenantId, subscriptionAlias,
-// subscriptionDomain.getDomainName(), subscriptionDomain.getApplicationContext());
-// }
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-
-// StratosApiResponse stratosApiResponse = new StratosApiResponse();
-// stratosApiResponse.setMessage("Successfully added domains to cartridge subscription");
-// return stratosApiResponse;
-
- throw new RestAPIException("Not implemented");
- }
-
-// public static boolean isSubscriptionDomainExists(ConfigurationContext configurationContext, String cartridgeType,
-// String subscriptionAlias, String domain) throws RestAPIException {
-// try {
-// int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
-// SubscriptionDomainBean subscriptionDomain = ObjectConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId,
-// subscriptionAlias, domain));
-//
-// if (subscriptionDomain.getDomainName() != null) {
-// return true;
-// } else {
-// return false;
-// }
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-//
-// }
-
-// public static List<SubscriptionDomainBean> getSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType,
-// String subscriptionAlias) throws RestAPIException {
-// try {
-// int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
-// return ObjectConverter.populateSubscriptionDomainPojos(cartridgeSubsciptionManager.getSubscriptionDomains(tenantId, subscriptionAlias));
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-// }
-
-// public static SubscriptionDomainBean getSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType,
-// String subscriptionAlias, String domain) throws RestAPIException {
-// try {
-// int tenantId = ApplicationManagementUtil
-// .getTenantId(configurationContext);
-// SubscriptionDomainBean subscriptionDomain = ObjectConverter.populateSubscriptionDomainPojo(cartridgeSubsciptionManager.getSubscriptionDomain(tenantId,
-// subscriptionAlias, domain));
-//
-// if (subscriptionDomain == null) {
-// String message = "Could not find a subscription [domain] "+domain+ " for Cartridge [type] "
-// +cartridgeType+ " and [alias] "+subscriptionAlias;
-// log.error(message);
-// throw new RestAPIException(Status.NOT_FOUND, message);
-// }
-//
-// return subscriptionDomain;
-//
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-// }
-
- public static StratosApiResponse removeSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType,
+ public static ApiResponseBean removeSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType,
String subscriptionAlias, String domain) throws RestAPIException {
-// try {
-// int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
-// cartridgeSubsciptionManager.removeSubscriptionDomain(tenantId, subscriptionAlias, domain);
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// throw new RestAPIException(e.getMessage(), e);
-// }
-//
-// StratosApiResponse stratosApiResponse = new StratosApiResponse();
-// stratosApiResponse.setMessage("Successfully removed domains from cartridge subscription");
-// return stratosApiResponse;
throw new RestAPIException("Not implemented");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bf5f947/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 4802b8a..54b90fb 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
@@ -21,13 +21,16 @@ package org.apache.stratos.rest.endpoint.api;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.*;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.common.beans.kubernetes.KubernetesCluster;
-import org.apache.stratos.common.beans.kubernetes.KubernetesHost;
-import org.apache.stratos.common.beans.kubernetes.KubernetesMaster;
-import org.apache.stratos.common.beans.repositoryNotificationInfoBean.Payload;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.application.GroupBean;
+import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
+import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
+import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean;
+import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
import org.apache.stratos.common.beans.topology.ApplicationInfoBean;
import org.apache.stratos.common.util.ClaimsMgtUtil;
import org.apache.stratos.common.util.CommonUtil;
@@ -89,7 +92,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/restlogin")
public Response initialize()
throws RestAPIException {
- StratosApiResponse response = new StratosApiResponse();
+ ApiResponseBean response = new ApiResponseBean();
response.setMessage("Successfully authenticated");
return Response.ok(response).build();
}
@@ -132,7 +135,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/cartridgeDefinition")
- public Response addCartridge(CartridgeDefinitionBean cartridgeDefinitionBean)
+ public Response addCartridge(CartridgeBean cartridgeDefinitionBean)
throws RestAPIException {
StratosApiV41Utils.addCartridge(cartridgeDefinitionBean);
URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build();
@@ -152,12 +155,12 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridges() throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
+ List<CartridgeBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
if (cartridges == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
- CartridgeDefinitionBean[] cartridgeArray = cartridges.isEmpty() ?
- new CartridgeDefinitionBean[0] : cartridges.toArray(new CartridgeDefinitionBean[cartridges.size()]);
+ CartridgeBean[] cartridgeArray = cartridges.isEmpty() ?
+ new CartridgeBean[0] : cartridges.toArray(new CartridgeBean[cartridges.size()]);
return Response.ok().entity(cartridgeArray).build();
}
@@ -167,7 +170,7 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridge(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
- CartridgeDefinitionBean cartridge = StratosApiV41Utils.getCartridge(cartridgeType);
+ CartridgeBean cartridge = StratosApiV41Utils.getCartridge(cartridgeType);
if (cartridge == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -189,13 +192,13 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridgesByFilter(@DefaultValue("") @PathParam("filter") String filter,
@QueryParam("criteria") String criteria) throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = StratosApiV41Utils.
+ List<CartridgeBean> cartridges = StratosApiV41Utils.
getCartridgesByFilter(filter, criteria, getConfigContext());
if (cartridges == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
- CartridgeDefinitionBean[] cartridgeArray = cartridges.isEmpty() ?
- new CartridgeDefinitionBean[0] : cartridges.toArray(new CartridgeDefinitionBean[cartridges.size()]);
+ CartridgeBean[] cartridgeArray = cartridges.isEmpty() ?
+ new CartridgeBean[0] : cartridges.toArray(new CartridgeBean[cartridges.size()]);
return Response.ok().entity(cartridgeArray).build();
}
@@ -214,7 +217,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridgeByFilter(@PathParam("cartridgeType") String cartridgeType,
@DefaultValue("") @PathParam("filter") String filter) throws RestAPIException {
- CartridgeDefinitionBean cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext());
+ CartridgeBean cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext());
if (cartridge == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -253,7 +256,7 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public Response addServiceGroup(ServiceGroupDefinition serviceGroupDefinition)
+ public Response addServiceGroup(GroupBean serviceGroupDefinition)
throws RestAPIException {
StratosApiV41Utils.addServiceGroup(serviceGroupDefinition);
URI url = uriInfo.getAbsolutePathBuilder().path(serviceGroupDefinition.getName()).build();
@@ -274,7 +277,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response getServiceGroupDefinition(@PathParam("groupDefinitionName") String groupDefinitionName)
throws RestAPIException {
- ServiceGroupDefinition serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(groupDefinitionName);
+ GroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(groupDefinitionName);
Response.ResponseBuilder rb;
if (serviceGroupDefinition != null) {
rb = Response.ok().entity(serviceGroupDefinition);
@@ -297,7 +300,7 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response getServiceGroups() throws RestAPIException {
- ServiceGroupDefinition[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions();
+ GroupBean[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions();
Response.ResponseBuilder rb;
if (serviceGroups != null) {
rb = Response.ok().entity(serviceGroups);
@@ -342,7 +345,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response addApplication(ApplicationDefinition applicationDefinition)
+ public Response addApplication(ApplicationBean applicationDefinition)
throws RestAPIException {
StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain());
URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
@@ -361,8 +364,8 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response getApplications() throws RestAPIException {
- List<ApplicationDefinition> applicationDefinitions = StratosApiV41Utils.getApplications();
- ApplicationDefinition[] applicationDefinitionsArray = applicationDefinitions.toArray(new ApplicationDefinition[applicationDefinitions.size()]);
+ List<ApplicationBean> applicationDefinitions = StratosApiV41Utils.getApplications();
+ ApplicationBean[] applicationDefinitionsArray = applicationDefinitions.toArray(new ApplicationBean[applicationDefinitions.size()]);
return Response.ok(applicationDefinitionsArray).build();
}
@@ -373,7 +376,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response getApplication(@PathParam("applicationId") String applicationId)
throws RestAPIException {
- ApplicationDefinition applicationDefinition = StratosApiV41Utils.getApplication(applicationId);
+ ApplicationBean applicationDefinition = StratosApiV41Utils.getApplication(applicationId);
if (applicationDefinition == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -392,7 +395,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response deployApplication(@PathParam("applicationId") String applicationId, DeploymentPolicy deploymentPolicy)
+ public Response deployApplication(@PathParam("applicationId") String applicationId, DeploymentPolicyBean deploymentPolicy)
throws RestAPIException {
StratosApiV41Utils.deployApplication(applicationId, deploymentPolicy);
return Response.accepted().build();
@@ -405,7 +408,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public Response getApplicationDeploymentPolicy(@PathParam("applicationId") String applicationId)
throws RestAPIException {
- DeploymentPolicy deploymentPolicy = StratosApiV41Utils.getDeploymentPolicy(applicationId);
+ DeploymentPolicyBean deploymentPolicy = StratosApiV41Utils.getDeploymentPolicy(applicationId);
if (deploymentPolicy == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -525,7 +528,7 @@ public class StratosApiV41 extends AbstractApi {
@SuperTenantService(true)
public Response removeApplication(@PathParam("applicationId") String applicationId)
throws RestAPIException {
- ApplicationDefinition applicationDefinition = StratosApiV41Utils.getApplication(applicationId);
+ ApplicationBean applicationDefinition = StratosApiV41Utils.getApplication(applicationId);
if (applicationDefinition == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -564,7 +567,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/view/autoscalingPolicy")
public Response getAutoscalingPolicy(@PathParam("autoscalePolicyId") String autoscalePolicyId)
throws RestAPIException {
- AutoscalePolicy autoScalePolicy = StratosApiV41Utils.getAutoScalePolicy(autoscalePolicyId);
+ AutoscalePolicyBean autoScalePolicy = StratosApiV41Utils.getAutoScalePolicy(autoscalePolicyId);
if (autoScalePolicy == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -583,7 +586,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/autoscalingPolicy")
- public Response addAutoscalingPolicy(AutoscalePolicy autoscalePolicy)
+ public Response addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicy)
throws RestAPIException {
StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy);
@@ -603,7 +606,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/autoscalingPolicy")
- public Response updateAutoscalingPolicyDefintion(AutoscalePolicy autoscalePolicy)
+ public Response updateAutoscalingPolicyDefintion(AutoscalePolicyBean autoscalePolicy)
throws RestAPIException {
StratosApiV41Utils.updateAutoscalingPolicy(autoscalePolicy);
@@ -612,25 +615,25 @@ public class StratosApiV41 extends AbstractApi {
// API methods for subscriptions
- /**
- * Gets the subscriptions of an application.
- *
- * @param applicationId the application id
- * @return the subscriptions of application
- * @throws RestAPIException the rest api exception
- */
- @GET
- @Path("/subscriptions/{applicationId}")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Response getSubscriptionsForApplication(@PathParam("applicationId") String applicationId) throws RestAPIException {
- List<ApplicationSubscription> subscriptions = StratosApiV41Utils.getApplicationSubscriptions(applicationId);
- if (subscriptions == null) {
- return Response.status(Response.Status.NOT_FOUND).build();
- }
- return Response.ok().entity(subscriptions).build();
- }
+// /**
+// * Gets the subscriptions of an application.
+// *
+// * @param applicationId the application id
+// * @return the subscriptions of application
+// * @throws RestAPIException the rest api exception
+// */
+// @GET
+// @Path("/subscriptions/{applicationId}")
+// @Produces("application/json")
+// @Consumes("application/json")
+// @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+// public Response getSubscriptionsForApplication(@PathParam("applicationId") String applicationId) throws RestAPIException {
+// List<ApplicationSubscription> subscriptions = StratosApiV41Utils.getApplicationSubscriptions(applicationId);
+// if (subscriptions == null) {
+// return Response.status(Response.Status.NOT_FOUND).build();
+// }
+// return Response.ok().entity(subscriptions).build();
+// }
/**
* Gets the subscribed cartridges of service group.
@@ -1243,7 +1246,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/sync")
- public Response notifyRepository(Payload payload) throws RestAPIException {
+ public Response notifyRepository(GitNotificationPayloadBean payload) throws RestAPIException {
if (log.isInfoEnabled()) {
log.info(String.format("Git update"));
}
@@ -1396,7 +1399,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/kubernetes")
- public Response addKubernetesHostCluster(KubernetesCluster kubernetesCluster) throws RestAPIException {
+ public Response addKubernetesHostCluster(KubernetesClusterBean kubernetesCluster) throws RestAPIException {
StratosApiV41Utils.addKubernetesCluster(kubernetesCluster);
URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesCluster.getClusterId()).build();
@@ -1416,7 +1419,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/kubernetes")
- public Response addKubernetesHost(@PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHost kubernetesHost)
+ public Response addKubernetesHost(@PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHostBean kubernetesHost)
throws RestAPIException {
StratosApiV41Utils.addKubernetesHost(kubernetesClusterId, kubernetesHost);
@@ -1436,7 +1439,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/kubernetes")
- public Response updateKubernetesMaster(KubernetesMaster kubernetesMaster) throws RestAPIException {
+ public Response updateKubernetesMaster(KubernetesMasterBean kubernetesMaster) throws RestAPIException {
try {
StratosApiV41Utils.updateKubernetesMaster(kubernetesMaster);
URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesMaster.getHostId()).build();
@@ -1452,7 +1455,7 @@ public class StratosApiV41 extends AbstractApi {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/add/kubernetes")
- public Response updateKubernetesHost(KubernetesHost kubernetesHost) throws RestAPIException {
+ public Response updateKubernetesHost(KubernetesHostBean kubernetesHost) throws RestAPIException {
try {
StratosApiV41Utils.updateKubernetesHost(kubernetesHost);
URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bf5f947/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 ef370fd..631983b 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
@@ -34,15 +34,19 @@ import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.domain.Persistence;
import org.apache.stratos.cloud.controller.stub.domain.Volume;
import org.apache.stratos.common.beans.*;
-import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.common.beans.cartridge.definition.PersistenceBean;
-import org.apache.stratos.common.beans.cartridge.definition.VolumeBean;
-import org.apache.stratos.common.beans.kubernetes.KubernetesCluster;
-import org.apache.stratos.common.beans.kubernetes.KubernetesHost;
-import org.apache.stratos.common.beans.kubernetes.KubernetesMaster;
-import org.apache.stratos.common.beans.repositoryNotificationInfoBean.Payload;
+import org.apache.stratos.common.beans.application.ApplicationBean;
+import org.apache.stratos.common.beans.application.GroupBean;
+import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
+import org.apache.stratos.common.beans.partition.ApplicationLevelNetworkPartitionBean;
+import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
+import org.apache.stratos.common.beans.cartridge.CartridgeBean;
+import org.apache.stratos.common.beans.cartridge.PersistenceBean;
+import org.apache.stratos.common.beans.cartridge.VolumeBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
+import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean;
+import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
+import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
import org.apache.stratos.common.beans.topology.ApplicationInfoBean;
import org.apache.stratos.common.beans.topology.ApplicationInstanceBean;
import org.apache.stratos.common.beans.topology.GroupInstanceBean;
@@ -79,7 +83,7 @@ public class StratosApiV41Utils {
private static Log log = LogFactory.getLog(StratosApiV41Utils.class);
// Util methods for cartridges
- public static void addCartridge(CartridgeDefinitionBean cartridgeDefinition) throws RestAPIException {
+ public static void addCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
try {
if(log.isDebugEnabled()) {
@@ -129,9 +133,9 @@ public class StratosApiV41Utils {
}
}
- public static List<CartridgeDefinitionBean> getCartridgesByFilter(String filter, String criteria, ConfigurationContext configurationContext)
+ public static List<CartridgeBean> getCartridgesByFilter(String filter, String criteria, ConfigurationContext configurationContext)
throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = null;
+ List<CartridgeBean> cartridges = null;
if (filter.equals("singleTenant")) {
cartridges = getAvailableCartridges(null, false, configurationContext);
@@ -146,11 +150,11 @@ public class StratosApiV41Utils {
return cartridges;
}
- public static CartridgeDefinitionBean getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
+ public static CartridgeBean getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = getCartridgesByFilter(filter, null, configurationContext);
+ List<CartridgeBean> cartridges = getCartridgesByFilter(filter, null, configurationContext);
- for (CartridgeDefinitionBean cartridge : cartridges) {
+ for (CartridgeBean cartridge : cartridges) {
if (cartridge.getType().equals(cartridgeType)) {
return cartridge;
}
@@ -160,12 +164,12 @@ public class StratosApiV41Utils {
throw new RestAPIException(msg);
}
- private static List<CartridgeDefinitionBean> getAvailableLbCartridges(Boolean multiTenant,
+ private static List<CartridgeBean> getAvailableLbCartridges(Boolean multiTenant,
ConfigurationContext configurationContext) throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = getAvailableCartridges(null, multiTenant,
+ List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant,
configurationContext);
- List<CartridgeDefinitionBean> lbCartridges = new ArrayList<CartridgeDefinitionBean>();
- for (CartridgeDefinitionBean cartridge : cartridges) {
+ List<CartridgeBean> lbCartridges = new ArrayList<CartridgeBean>();
+ for (CartridgeBean cartridge : cartridges) {
if ("loadbalancer".equalsIgnoreCase(cartridge.getCategory())) {
lbCartridges.add(cartridge);
}
@@ -180,8 +184,8 @@ public class StratosApiV41Utils {
* @return List of the cartridge definitions
* @throws RestAPIException
*/
- private static List<CartridgeDefinitionBean> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = new ArrayList<CartridgeDefinitionBean>();
+ private static List<CartridgeBean> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
if (log.isDebugEnabled()) {
log.debug("Reading cartridges: [provider-name] " + provider );
@@ -214,7 +218,7 @@ public class StratosApiV41Utils {
continue;
}
- CartridgeDefinitionBean cartridge = convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
+ CartridgeBean cartridge = convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
cartridges.add(cartridge);
}
} else {
@@ -243,8 +247,8 @@ public class StratosApiV41Utils {
return cartridges;
}
- public static List<CartridgeDefinitionBean> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<CartridgeDefinitionBean> cartridges = new ArrayList<CartridgeDefinitionBean>();
+ public static List<CartridgeBean> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>();
if (log.isDebugEnabled()) {
log.debug("Getting available cartridges. Search String: " + cartridgeSearchString + ", Multi-Tenant: " + multiTenant);
@@ -289,7 +293,7 @@ public class StratosApiV41Utils {
continue;
}
- CartridgeDefinitionBean cartridge = convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
+ CartridgeBean cartridge = convertCartridgeToCartridgeDefinitionBean(cartridgeInfo);
cartridges.add(cartridge);
@@ -326,7 +330,7 @@ public class StratosApiV41Utils {
return cartridges;
}
- public static CartridgeDefinitionBean getCartridge(String cartridgeType) throws RestAPIException {
+ public static CartridgeBean getCartridge(String cartridgeType) throws RestAPIException {
try {
CartridgeInfo cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
if(cartridgeInfo == null) {
@@ -344,8 +348,8 @@ public class StratosApiV41Utils {
}
}
- private static CartridgeDefinitionBean convertCartridgeToCartridgeDefinitionBean(CartridgeInfo cartridgeInfo) {
- CartridgeDefinitionBean cartridge = new CartridgeDefinitionBean();
+ private static CartridgeBean convertCartridgeToCartridgeDefinitionBean(CartridgeInfo cartridgeInfo) {
+ CartridgeBean cartridge = new CartridgeBean();
cartridge.setType(cartridgeInfo.getType());
cartridge.setProvider(cartridgeInfo.getProvider());
cartridge.setCategory(cartridgeInfo.getCategory());
@@ -449,7 +453,7 @@ public class StratosApiV41Utils {
// Util methods for Autoscaling policies
- public static void addAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
+ public static void addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException {
log.info(String.format("Adding autoscaling policy: [id] %s", autoscalePolicyBean.getId()));
@@ -474,7 +478,7 @@ public class StratosApiV41Utils {
}
}
- public static void updateAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
+ public static void updateAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException {
log.info(String.format("Updating autoscaling policy: [id] %s", autoscalePolicyBean.getId()));
@@ -497,7 +501,7 @@ public class StratosApiV41Utils {
}
}
- public static AutoscalePolicy[] getAutoScalePolicies() throws RestAPIException {
+ public static AutoscalePolicyBean[] getAutoScalePolicies() throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] autoscalePolicies = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -514,7 +518,7 @@ public class StratosApiV41Utils {
return ObjectConverter.convertStubAutoscalePoliciesToAutoscalePolicies(autoscalePolicies);
}
- public static AutoscalePolicy getAutoScalePolicy(String autoscalePolicyId) throws RestAPIException {
+ public static AutoscalePolicyBean getAutoScalePolicy(String autoscalePolicyId) throws RestAPIException {
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
@@ -533,7 +537,7 @@ public class StratosApiV41Utils {
return ObjectConverter.convertStubAutoscalePolicyToAutoscalePolicy(autoscalePolicy);
}
- public static org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy
+ public static DeploymentPolicyBean
getDeploymentPolicy(String applicationId) throws RestAPIException {
try {
@@ -547,7 +551,7 @@ public class StratosApiV41Utils {
}
}
- public static ApplicationLevelNetworkPartition[] getPartitionGroups(String deploymentPolicyId)
+ public static ApplicationLevelNetworkPartitionBean[] getPartitionGroups(String deploymentPolicyId)
throws RestAPIException {
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[] partitionGroups = null;
@@ -602,7 +606,7 @@ public class StratosApiV41Utils {
// Util methods for repo actions
- public static void notifyArtifactUpdatedEvent(Payload payload) throws RestAPIException {
+ public static void notifyArtifactUpdatedEvent(GitNotificationPayloadBean payload) throws RestAPIException {
try {
StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.notifyArtifactUpdatedEventForRepository(payload.getRepository().getUrl());
@@ -615,7 +619,7 @@ public class StratosApiV41Utils {
// Util methods for service groups
- public static void addServiceGroup(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException {
+ public static void addServiceGroup(GroupBean serviceGroupDefinition) throws RestAPIException {
try {
if (serviceGroupDefinition == null) {
throw new RuntimeException("Service Group definition is null");
@@ -671,9 +675,9 @@ public class StratosApiV41Utils {
log.debug("checking subGroups in service group " + serviceGroupDefinition.getName());
}
- List<ServiceGroupDefinition> groupDefinitions = serviceGroupDefinition.getGroups();
+ List<GroupBean> groupDefinitions = serviceGroupDefinition.getGroups();
List<String> groupNames = new ArrayList<String>();
- for (ServiceGroupDefinition groupList : groupDefinitions) {
+ for (GroupBean groupList : groupDefinitions) {
groupNames.add(groupList.getName());
}
@@ -721,7 +725,7 @@ public class StratosApiV41Utils {
return retVals;
}
- public static ServiceGroupDefinition getServiceGroupDefinition(String name) throws RestAPIException {
+ public static GroupBean getServiceGroupDefinition(String name) throws RestAPIException {
if (log.isDebugEnabled()) {
log.debug("Reading service group: [group-name] " + name);
@@ -734,7 +738,7 @@ public class StratosApiV41Utils {
return null;
}
- ServiceGroupDefinition serviceGroupDef = ObjectConverter.convertStubServiceGroupToServiceGroupDefinition(serviceGroup);
+ GroupBean serviceGroupDef = ObjectConverter.convertStubServiceGroupToServiceGroupDefinition(serviceGroup);
return serviceGroupDef;
} catch (Exception e) {
@@ -744,7 +748,7 @@ public class StratosApiV41Utils {
}
}
- public static ServiceGroupDefinition[] getServiceGroupDefinitions() throws RestAPIException {
+ public static GroupBean[] getServiceGroupDefinitions() throws RestAPIException {
if (log.isDebugEnabled()) {
log.debug("Reading service groups...");
@@ -757,7 +761,7 @@ public class StratosApiV41Utils {
return null;
}
- ServiceGroupDefinition[] serviceGroupDefinitions = new ServiceGroupDefinition[serviceGroups.length];
+ GroupBean[] serviceGroupDefinitions = new GroupBean[serviceGroups.length];
for (int i = 0; i < serviceGroups.length; i++) {
serviceGroupDefinitions[i] = ObjectConverter.convertStubServiceGroupToServiceGroupDefinition(serviceGroups[i]);
}
@@ -795,7 +799,7 @@ public class StratosApiV41Utils {
* @param tenantDomain
* @throws RestAPIException
*/
- public static void addApplication(ApplicationDefinition appDefinition, ConfigurationContext ctxt,
+ public static void addApplication(ApplicationBean appDefinition, ConfigurationContext ctxt,
String userName, String tenantDomain)
throws RestAPIException {
@@ -843,7 +847,7 @@ public class StratosApiV41Utils {
*/
public static void deployApplication(
String applicationId,
- org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy deploymentPolicy)
+ DeploymentPolicyBean deploymentPolicy)
throws RestAPIException {
try {
@@ -892,10 +896,6 @@ public class StratosApiV41Utils {
}
}
- public static List<ApplicationSubscription> getApplicationSubscriptions(String applicationId) throws RestAPIException {
- return null;
- }
-
public static void removeApplication(String applicationId) throws RestAPIException {
try {
@@ -907,7 +907,7 @@ public class StratosApiV41Utils {
}
}
- public static ApplicationDefinition getApplication(String applicationId) throws RestAPIException {
+ public static ApplicationBean getApplication(String applicationId) throws RestAPIException {
try {
return ObjectConverter.convertStubApplicationContextToApplicationDefinition(
AutoscalerServiceClient.getInstance().getApplication(applicationId));
@@ -918,14 +918,14 @@ public class StratosApiV41Utils {
}
}
- public static List<ApplicationDefinition> getApplications() throws RestAPIException {
+ public static List<ApplicationBean> getApplications() throws RestAPIException {
try {
- List<ApplicationDefinition> applicationDefinitions = new ArrayList<ApplicationDefinition>();
+ List<ApplicationBean> applicationDefinitions = new ArrayList<ApplicationBean>();
ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications();
if(applicationContexts != null) {
for (ApplicationContext applicationContext : applicationContexts) {
if(applicationContext != null) {
- ApplicationDefinition applicationDefinition =
+ ApplicationBean applicationDefinition =
ObjectConverter.convertStubApplicationContextToApplicationDefinition(applicationContext);
applicationDefinitions.add(applicationDefinition);
}
@@ -1110,7 +1110,7 @@ public class StratosApiV41Utils {
// Util methods for Kubernetes clusters
- public static boolean addKubernetesCluster(KubernetesCluster kubernetesClusterBean) throws RestAPIException {
+ public static boolean addKubernetesCluster(KubernetesClusterBean kubernetesClusterBean) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1131,7 +1131,7 @@ public class StratosApiV41Utils {
return false;
}
- public static boolean addKubernetesHost(String kubernetesClusterId, KubernetesHost kubernetesHostBean)
+ public static boolean addKubernetesHost(String kubernetesClusterId, KubernetesHostBean kubernetesHostBean)
throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
@@ -1157,7 +1157,7 @@ public class StratosApiV41Utils {
return false;
}
- public static boolean updateKubernetesMaster(KubernetesMaster kubernetesMasterBean) throws RestAPIException {
+ public static boolean updateKubernetesMaster(KubernetesMasterBean kubernetesMasterBean) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1182,7 +1182,7 @@ public class StratosApiV41Utils {
return false;
}
- public static KubernetesCluster[] getAvailableKubernetesClusters() throws RestAPIException {
+ public static KubernetesClusterBean[] getAvailableKubernetesClusters() throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1199,7 +1199,7 @@ public class StratosApiV41Utils {
return null;
}
- public static KubernetesCluster getKubernetesCluster(String kubernetesClusterId) throws RestAPIException {
+ public static KubernetesClusterBean getKubernetesCluster(String kubernetesClusterId) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1258,7 +1258,7 @@ public class StratosApiV41Utils {
return false;
}
- public static KubernetesHost[] getKubernetesHosts(String kubernetesClusterId) throws RestAPIException {
+ public static KubernetesHostBean[] getKubernetesHosts(String kubernetesClusterId) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
@@ -1266,8 +1266,8 @@ public class StratosApiV41Utils {
org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost[]
kubernetesHosts = cloudControllerServiceClient.getKubernetesHosts(kubernetesClusterId);
- List<KubernetesHost> arrayList = ObjectConverter.convertStubKubernetesHostsToKubernetesHosts(kubernetesHosts);
- KubernetesHost[] array = new KubernetesHost[arrayList.size()];
+ List<KubernetesHostBean> arrayList = ObjectConverter.convertStubKubernetesHostsToKubernetesHosts(kubernetesHosts);
+ KubernetesHostBean[] array = new KubernetesHostBean[arrayList.size()];
array = arrayList.toArray(array);
return array;
} catch (RemoteException e) {
@@ -1282,7 +1282,7 @@ public class StratosApiV41Utils {
return null;
}
- public static KubernetesMaster getKubernetesMaster(String kubernetesClusterId) throws RestAPIException {
+ public static KubernetesMasterBean getKubernetesMaster(String kubernetesClusterId) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
try {
@@ -1302,7 +1302,7 @@ public class StratosApiV41Utils {
return null;
}
- public static boolean updateKubernetesHost(KubernetesHost kubernetesHostBean) throws RestAPIException {
+ public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws RestAPIException {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost =
@@ -1330,7 +1330,7 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application id is null");
}
- ApplicationDefinition application = getApplication(applicationId);
+ ApplicationBean application = getApplication(applicationId);
if(application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
@@ -1389,7 +1389,7 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application id is null");
}
- ApplicationDefinition application = getApplication(applicationId);
+ ApplicationBean application = getApplication(applicationId);
if(application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
@@ -1420,7 +1420,7 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application id is null");
}
- ApplicationDefinition application = getApplication(applicationId);
+ ApplicationBean application = getApplication(applicationId);
if(application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}
@@ -1452,7 +1452,7 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application id is null");
}
- ApplicationDefinition application = getApplication(applicationId);
+ ApplicationBean application = getApplication(applicationId);
if(application == null) {
throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
}