Repository: stratos Updated Branches: refs/heads/tenant-isolation e0f6286ec -> eac4c961f
Update the application with UUID Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/eac4c961 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/eac4c961 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/eac4c961 Branch: refs/heads/tenant-isolation Commit: eac4c961ff4d130023b325104adb2fea0d821651 Parents: e0f6286 Author: Gayan Gunarathne <[email protected]> Authored: Thu Jul 9 11:56:50 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Thu Jul 9 11:56:50 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 22 ++++++++++---------- .../applications/pojo/ApplicationContext.java | 19 ++++++++++++----- .../autoscaler/context/AutoscalerContext.java | 6 +++--- .../autoscaler/registry/RegistryManager.java | 4 ++-- .../services/impl/AutoscalerServiceImpl.java | 20 +++++++++--------- .../stratos/cli/RestCommandLineService.java | 2 +- .../beans/application/ApplicationBean.java | 19 ++++++++++++----- .../rest/endpoint/api/StratosApiV41.java | 9 ++++---- .../rest/endpoint/api/StratosApiV41Utils.java | 20 +++++++++--------- .../util/converter/ObjectConverter.java | 4 ++-- 10 files changed, 72 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index e8dfc67..0228f2b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -87,7 +87,7 @@ public class DefaultApplicationParser implements ApplicationParser { handleError("Invalid application definition, application alias is not found in application context"); } - if (applicationContext.getApplicationId() == null || applicationContext.getApplicationId().isEmpty()) { + if (applicationContext.getApplicationUuid() == null || applicationContext.getApplicationUuid().isEmpty()) { handleError("Invalid application definition, application id is not found in application context"); } @@ -106,7 +106,7 @@ public class DefaultApplicationParser implements ApplicationParser { handleError("Invalid application definition, subscribable information is not found in application context"); } - oauthToken = createToken(applicationContext.getApplicationId()); + oauthToken = createToken(applicationContext.getApplicationUuid()); return buildCompositeAppStructure(applicationContext, subscribablesInfo); } @@ -219,7 +219,7 @@ public class DefaultApplicationParser implements ApplicationParser { Map<String, SubscribableInfoContext> subscribableInfoContextMap = new HashMap<String, SubscribableInfoContext>(); - String applicationId = applicationContext.getApplicationId(); + String applicationId = applicationContext.getApplicationUuid(); ComponentContext componentContext = applicationContext.getComponents(); if (componentContext != null) { CartridgeContext[] cartridgeContexts = componentContext.getCartridgeContexts(); @@ -248,7 +248,7 @@ public class DefaultApplicationParser implements ApplicationParser { Map<String, SubscribableInfoContext> subscribableInfoCtxts) throws ApplicationDefinitionException, CartridgeGroupNotFoundException, CartridgeNotFoundException { - Application application = new Application(applicationContext.getApplicationId()); + Application application = new Application(applicationContext.getApplicationUuid()); // Set tenant information application.setTenantId(applicationContext.getTenantId()); @@ -309,7 +309,7 @@ public class DefaultApplicationParser implements ApplicationParser { Set<StartupOrder> startupOrders = application.getDependencyOrder().getStartupOrders(); Map<String, Map<String, ClusterDataHolder>> clusterDataMap; - clusterDataMap = parseLeafLevelSubscriptions(applicationContext.getApplicationId(), + clusterDataMap = parseLeafLevelSubscriptions(applicationContext.getApplicationUuid(), applicationContext.getTenantId(), application.getKey(), null, cartridgeContextList, startupOrders); application.setClusterData(clusterDataMap.get(ALIAS)); application.setClusterDataForType(clusterDataMap.get(CARTRIDGE_TYPE)); @@ -318,7 +318,7 @@ public class DefaultApplicationParser implements ApplicationParser { // Set groups if (components.getGroupContexts() != null) { application.setGroups( - parseGroups(applicationContext.getApplicationId(), applicationContext.getTenantId(), + parseGroups(applicationContext.getApplicationUuid(), applicationContext.getTenantId(), application.getKey(), Arrays.asList(components.getGroupContexts()), subscribableInfoCtxts)); } @@ -329,7 +329,7 @@ public class DefaultApplicationParser implements ApplicationParser { AutoscalerUtil.getAliasToDeploymentPolicyIdMapOfApplication(applicationContext)); if (log.isDebugEnabled()) { - log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationId()); + log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationUuid()); } return application; } @@ -364,7 +364,7 @@ public class DefaultApplicationParser implements ApplicationParser { SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); - Cartridge cartridge = getCartridgeByTenant(cartridgeType,tenantId); + Cartridge cartridge = getCartridgeByTenant(cartridgeType, tenantId); if (cartridge == null) { throw new CartridgeNotFoundException("Cartridge not found " + cartridgeType); } @@ -410,7 +410,7 @@ public class DefaultApplicationParser implements ApplicationParser { String.format("Could not find dependent cartridge for " + "application: %s cartridge-alias: %s", appId, cartridgeAlias)); } - Cartridge dependencyCartridge = getCartridgeByTenant(dependentCartridgeType,tenantId); + Cartridge dependencyCartridge = getCartridgeByTenant(dependentCartridgeType, tenantId); ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType); if (dataHolder != null) { @@ -498,7 +498,7 @@ public class DefaultApplicationParser implements ApplicationParser { String subscriptionAlias = subscribableInfoContext.getAlias(); // check if a cartridge with relevant type is already deployed. else, can't continue - Cartridge cartridge = getCartridgeByTenant(cartridgeType,tenantId); + Cartridge cartridge = getCartridgeByTenant(cartridgeType, tenantId); if (cartridge == null) { handleError("No deployed Cartridge found with type [ " + cartridgeType + " ] for Composite Application"); @@ -1004,7 +1004,7 @@ public class DefaultApplicationParser implements ApplicationParser { private Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws ApplicationDefinitionException { try { - return CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); + return CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType, tenantId); } catch (Exception e) { log.error(String.format("Unable to get the cartridge: %s %d " , cartridgeType , tenantId), e); throw new ApplicationDefinitionException(e); http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java index ec79fcf..9828eee 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java @@ -31,7 +31,8 @@ public class ApplicationContext implements Serializable { public static final String STATUS_DEPLOYED = "Deployed"; public static final String STATUS_UNDEPLOYING = "Undeploying"; - private String applicationId; + private String applicationUuid; + private String applicationId; private String alias; private boolean multiTenant; private String name; @@ -46,12 +47,12 @@ public class ApplicationContext implements Serializable { public ApplicationContext() { } - public String getApplicationId() { - return applicationId; + public String getApplicationUuid() { + return applicationUuid; } - public void setApplicationId(String applicationId) { - this.applicationId = applicationId; + public void setApplicationUuid(String applicationUuid) { + this.applicationUuid = applicationUuid; } public String getAlias() { @@ -134,4 +135,12 @@ public class ApplicationContext implements Serializable { public void setDescription(String description) { this.description = description; } + + public String getApplicationId() { + return applicationId; + } + + public void setApplicationId(String applicationId) { + this.applicationId = applicationId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java index 51e9d16..8fd106f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java @@ -95,7 +95,7 @@ public class AutoscalerContext { Map<String, ApplicationContext> applicationContextMap = distributedObjectProvider.getMap(AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP);//new ConcurrentHashMap<String, ApplicationContext>(); for (String resourcePath : resourcePaths) { ApplicationContext applicationContext = RegistryManager.getInstance().getApplicationContextByResourcePath(resourcePath); - applicationContextMap.put(applicationContext.getApplicationId(), applicationContext); + applicationContextMap.put(applicationContext.getApplicationUuid(), applicationContext); } return applicationContextMap; } @@ -168,7 +168,7 @@ public class AutoscalerContext { } public void addApplicationContext(ApplicationContext applicationContext) { - applicationContextMap.put(applicationContext.getApplicationId(), applicationContext); + applicationContextMap.put(applicationContext.getApplicationUuid(), applicationContext); RegistryManager.getInstance().persistApplicationContext(applicationContext); } @@ -186,7 +186,7 @@ public class AutoscalerContext { } public void updateApplicationContext(ApplicationContext applicationContext) { - applicationContextMap.put(applicationContext.getApplicationId(), applicationContext); + applicationContextMap.put(applicationContext.getApplicationUuid(), applicationContext); RegistryManager.getInstance().persistApplicationContext(applicationContext); } http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java index 1577adb..a9dfc54 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java @@ -264,10 +264,10 @@ public class RegistryManager { try { startTenantFlow(); String resourcePath = AutoscalerConstants.AUTOSCALER_RESOURCE + - AutoscalerConstants.APPLICATION_CONTEXTS_RESOURCE + "/" + applicationContext.getApplicationId(); + AutoscalerConstants.APPLICATION_CONTEXTS_RESOURCE + "/" + applicationContext.getApplicationUuid(); persist(applicationContext, resourcePath); if (log.isDebugEnabled()) { - log.debug("Application context [" + applicationContext.getApplicationId() + "] " + + log.debug("Application context [" + applicationContext.getApplicationUuid() + "] " + "persisted successfully in the autoscaler registry"); } } finally { http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index b6cd3c8..c568a32 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -212,7 +212,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info(String.format("Adding application: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } ApplicationParser applicationParser = new DefaultApplicationParser(); @@ -229,7 +229,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info(String.format("Application added successfully: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } return true; } @@ -239,10 +239,10 @@ public class AutoscalerServiceImpl implements AutoscalerService { throws ApplicationDefinitionException, CartridgeGroupNotFoundException, CartridgeNotFoundException { - String applicationId = applicationContext.getApplicationId(); + String applicationId = applicationContext.getApplicationUuid(); if (log.isInfoEnabled()) { log.info(String.format("Updating application: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } if (AutoscalerContext.getInstance().getApplicationContext(applicationId) == null) { @@ -397,13 +397,13 @@ public class AutoscalerServiceImpl implements AutoscalerService { try { if (log.isInfoEnabled()) { log.info(String.format("Adding application signup: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } ComponentContext components = applicationContext.getComponents(); if (components != null) { ApplicationSignUp applicationSignUp = new ApplicationSignUp(); - applicationSignUp.setApplicationId(applicationContext.getApplicationId()); + applicationSignUp.setApplicationId(applicationContext.getApplicationUuid()); applicationSignUp.setTenantId(applicationContext.getTenantId()); String[] clusterIdsArray = clusterIds.toArray(new String[clusterIds.size()]); applicationSignUp.setClusterIds(clusterIdsArray); @@ -434,11 +434,11 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info(String.format("Application signup added successfully: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } } } catch (Exception e) { - String message = "Could not add application signup: [application-id]" + applicationContext.getApplicationId(); + String message = "Could not add application signup: [application-id]" + applicationContext.getApplicationUuid(); log.error(message, e); throw new RuntimeException(message, e); } @@ -471,12 +471,12 @@ public class AutoscalerServiceImpl implements AutoscalerService { try { if (log.isInfoEnabled()) { log.info(String.format("Removing application signup: [application-id] %s", - applicationContext.getApplicationId())); + applicationContext.getApplicationUuid())); } StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance(); - ApplicationSignUp applicationSignUp[] = serviceClient.getApplicationSignUps(applicationContext.getApplicationId()); + ApplicationSignUp applicationSignUp[] = serviceClient.getApplicationSignUps(applicationContext.getApplicationUuid()); if (applicationSignUp != null) { for (ApplicationSignUp appSignUp : applicationSignUp) { if (appSignUp != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index d6316eb..7b7a0c0 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -990,7 +990,7 @@ public class RestCommandLineService { RowMapper<ApplicationBean> rowMapper = new RowMapper<ApplicationBean>() { public String[] getData(ApplicationBean applicationDefinition) { String[] data = new String[3]; - data[0] = applicationDefinition.getApplicationId(); + data[0] = applicationDefinition.getApplicationUuid(); data[1] = applicationDefinition.getAlias(); data[2] = applicationDefinition.getStatus(); return data; http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java index 92e4428..8c08dc9 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java @@ -30,7 +30,8 @@ public class ApplicationBean implements Serializable { private static final long serialVersionUID = -2829206180707597651L; - private String applicationId; + private String applicationUuid; + private String applicationId; private boolean multiTenant; private String name; private String description; @@ -40,12 +41,12 @@ public class ApplicationBean implements Serializable { private List<PropertyBean> property; private int tenantId; - public String getApplicationId() { - return applicationId; + public String getApplicationUuid() { + return applicationUuid; } - public void setApplicationId(String applicationId) { - this.applicationId = applicationId; + public void setApplicationUuid(String applicationUuid) { + this.applicationUuid = applicationUuid; } public boolean isMultiTenant() { @@ -111,4 +112,12 @@ public class ApplicationBean implements Serializable { public void setTenantId(int tenantId) { this.tenantId = tenantId; } + + public String getApplicationId() { + return applicationId; + } + + public void setApplicationId(String applicationId) { + this.applicationId = applicationId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/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 f54c35c..1fe596f 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 @@ -781,14 +781,15 @@ public class StratosApiV41 extends AbstractApi { try { PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); applicationDefinition.setTenantId(carbonContext.getTenantId()); + applicationDefinition.setApplicationUuid(UUID.randomUUID().toString()); StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain()); - URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationUuid()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Application added successfully: [application] %s", - applicationDefinition.getApplicationId()))).build(); + applicationDefinition.getApplicationUuid()))).build(); } catch (ApplicationAlreadyExistException e) { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Application already exists")).build(); @@ -824,10 +825,10 @@ public class StratosApiV41 extends AbstractApi { try { StratosApiV41Utils.updateApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain()); - URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationUuid()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Application updated successfully: [application] %s", - applicationDefinition.getApplicationId()))).build(); + applicationDefinition.getApplicationUuid()))).build(); } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) { String backendErrorMessage = e.getFaultMessage().getCartridgeNotFoundException(). getMessage(); http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/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 c014466..de8b826 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 @@ -1260,7 +1260,7 @@ public class StratosApiV41Utils { try { AutoscalerServiceClient asServiceClient = AutoscalerServiceClient.getInstance(); - ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name,tenantId); + ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name, tenantId); if (serviceGroup == null) { return null; } @@ -1324,7 +1324,7 @@ public class StratosApiV41Utils { // Check whether cartridge group exists try { - if (asServiceClient.getServiceGroupByTenant(name,tenantId) == null) { + if (asServiceClient.getServiceGroupByTenant(name, tenantId) == null) { String message = "Cartridge group: [group-name] " + name + " cannot be removed since it does not exist"; log.error(message); throw new RestAPIException(message); @@ -1337,7 +1337,7 @@ public class StratosApiV41Utils { throw new RestAPIException(message); } - ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name,tenantId); + ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name, tenantId); asServiceClient.undeployServiceGroupDefinition(serviceGroup.getUuid()); @@ -1434,8 +1434,8 @@ public class StratosApiV41Utils { } // check if an application with same id already exists try { - if (AutoscalerServiceClient.getInstance().existApplication(appDefinition.getApplicationId())) { - String msg = "Application already exists: [application-id] " + appDefinition.getApplicationId(); + if (AutoscalerServiceClient.getInstance().existApplication(appDefinition.getApplicationUuid())) { + String msg = "Application already exists: [application-id] " + appDefinition.getApplicationUuid(); throw new RestAPIException(msg); } } catch (RemoteException e) { @@ -1473,11 +1473,11 @@ public class StratosApiV41Utils { findCartridgesAndGroupsInApplication(appDefinition, usedCartridges, usedCartridgeGroups); StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); smServiceClient.addUsedCartridgesInApplications( - appDefinition.getApplicationId(), + appDefinition.getApplicationUuid(), usedCartridges.toArray(new String[usedCartridges.size()])); smServiceClient.addUsedCartridgeGroupsInApplications( - appDefinition.getApplicationId(), + appDefinition.getApplicationUuid(), usedCartridgeGroups.toArray(new String[usedCartridgeGroups.size()])); } catch (AutoscalerServiceApplicationDefinitionExceptionException e) { @@ -1501,7 +1501,7 @@ public class StratosApiV41Utils { String userName, String tenantDomain) throws RestAPIException, AutoscalerServiceCartridgeNotFoundExceptionException, AutoscalerServiceCartridgeGroupNotFoundExceptionException { - if (StringUtils.isBlank(appDefinition.getApplicationId())) { + if (StringUtils.isBlank(appDefinition.getApplicationUuid())) { String message = "Please specify the application name"; log.error(message); throw new RestAPIException(message); @@ -1875,11 +1875,11 @@ public class StratosApiV41Utils { findCartridgesAndGroupsInApplication(application, usedCartridges, usedCartridgeGroups); StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); smServiceClient.removeUsedCartridgesInApplications( - application.getApplicationId(), + application.getApplicationUuid(), usedCartridges.toArray(new String[usedCartridges.size()])); smServiceClient.removeUsedCartridgeGroupsInApplications( - application.getApplicationId(), + application.getApplicationUuid(), usedCartridgeGroups.toArray(new String[usedCartridgeGroups.size()])); } catch (RemoteException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/eac4c961/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 10a0757..8322457 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1111,7 +1111,7 @@ public class ObjectConverter { org.apache.stratos.autoscaler.stub.pojo.ApplicationContext applicationContext = new org.apache.stratos.autoscaler.stub.pojo.ApplicationContext(); - applicationContext.setApplicationId(applicationDefinition.getApplicationId()); + applicationContext.setApplicationId(applicationDefinition.getApplicationUuid()); applicationContext.setAlias(applicationDefinition.getAlias()); applicationContext.setMultiTenant(applicationDefinition.isMultiTenant()); applicationContext.setName(applicationDefinition.getName()); @@ -1151,7 +1151,7 @@ public class ObjectConverter { } ApplicationBean applicationDefinition = new ApplicationBean(); - applicationDefinition.setApplicationId(applicationContext.getApplicationId()); + applicationDefinition.setApplicationUuid(applicationContext.getApplicationId()); applicationDefinition.setAlias(applicationContext.getAlias()); applicationDefinition.setMultiTenant(applicationContext.getMultiTenant()); applicationDefinition.setName(applicationContext.getName());
