Change all methods which has void return type to boolean return type
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8e5397ea Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8e5397ea Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8e5397ea Branch: refs/heads/master Commit: 8e5397ea0664aa05d0a990716a55d8bb49a7198f Parents: 0b220bf Author: Lahiru Sandaruwan <[email protected]> Authored: Mon May 11 14:00:32 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon May 11 14:00:41 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/services/AutoscalerService.java | 31 +- .../services/impl/AutoscalerServiceImpl.java | 52 +- .../src/main/resources/AutoscalerService.wsdl | 638 +++++++++++++------ 3 files changed, 505 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5397ea/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java index 76e7e8e..9aa9e6a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java @@ -82,10 +82,10 @@ public interface AutoscalerService { /** * Add an application * - * @param applicationContext {@link org.apache.stratos.autoscaler.applications.pojo.ApplicationContext} + * @param applicationContext {@link ApplicationContext} * @throws ApplicationDefinitionException if an error occurs */ - public void addApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException; + public boolean addApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException; /** * update an application @@ -93,7 +93,7 @@ public interface AutoscalerService { * @param applicationContext {@link org.apache.stratos.autoscaler.applications.pojo.ApplicationContext} * @throws ApplicationDefinitionException if an error occurs */ - public void updateApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException; + public boolean updateApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException; /** @@ -132,14 +132,14 @@ public interface AutoscalerService { * @return */ - public void undeployApplication(String applicationId, boolean force); + public boolean undeployApplication(String applicationId, boolean force); /** * Delete an application * * @param applicationId */ - public void deleteApplication(String applicationId); + public boolean deleteApplication(String applicationId); /** * Add application policy @@ -149,7 +149,7 @@ public interface AutoscalerService { * @throws RemoteException * @throws InvalidPolicyException */ - public void addApplicationPolicy(ApplicationPolicy applicationPolicy) throws RemoteException, InvalidApplicationPolicyException, InvalidPolicyException; + public boolean addApplicationPolicy(ApplicationPolicy applicationPolicy) throws RemoteException, InvalidApplicationPolicyException, InvalidPolicyException; /** * Get application policy by application id @@ -165,7 +165,7 @@ public interface AutoscalerService { * @param applicationPolicyId the application policy id * @throws InvalidPolicyException */ - public void removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException; + public boolean removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException; /** * Update the given application policy if exists @@ -175,7 +175,7 @@ public interface AutoscalerService { * @throws RemoteException * @throws ApplicatioinPolicyNotExistsException */ - public void updateApplicationPolicy(ApplicationPolicy applicationPolicy) + public boolean updateApplicationPolicy(ApplicationPolicy applicationPolicy) throws InvalidApplicationPolicyException, RemoteException, ApplicatioinPolicyNotExistsException; /** @@ -187,11 +187,10 @@ public interface AutoscalerService { /** * Dynamically update the properties of an Autoscaling Cluster Monitor - * - * @param clusterId id of the cluster. + * @param clusterId id of the cluster. * @param properties updated properties. */ - void updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException; + boolean updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException; /** * Add a cartridge group @@ -199,14 +198,14 @@ public interface AutoscalerService { * @param servicegroup * @throws InvalidServiceGroupException */ - public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException; + public boolean addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException; /** * Remove a cartridge group * * @param groupName */ - public void removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException; + public boolean removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException; /** * Get cartridge group @@ -234,7 +233,7 @@ public interface AutoscalerService { * @throws InvalidDeploymentPolicyException if the deployment policy is not valid * @throws IllegalArgumentException if the provided argument is not valid. */ - public void addDeployementPolicy(DeploymentPolicy deploymentPolicy) throws DeploymentPolicyAlreadyExistsException, + public boolean addDeployementPolicy(DeploymentPolicy deploymentPolicy) throws DeploymentPolicyAlreadyExistsException, InvalidDeploymentPolicyException, RemoteException, DeploymentPolicyNotExistsException; /** @@ -243,7 +242,7 @@ public interface AutoscalerService { * @param deploymentPolicy DeployementPolicy * @throws IllegalArgumentException if the provided argument is not valid. */ - public void updateDeploymentPolicy(DeploymentPolicy deploymentPolicy) throws DeploymentPolicyNotExistsException, + public boolean updateDeploymentPolicy(DeploymentPolicy deploymentPolicy) throws DeploymentPolicyNotExistsException, InvalidDeploymentPolicyException, RemoteException, InvalidPolicyException, CloudControllerConnectionException; /** @@ -252,7 +251,7 @@ public interface AutoscalerService { * @param deploymentPolicyID deploymentPolicyID * @throws IllegalArgumentException if the provided argument is not valid. */ - public void removeDeployementPolicy(String deploymentPolicyID) throws DeploymentPolicyNotExistsException, + public boolean removeDeployementPolicy(String deploymentPolicyID) throws DeploymentPolicyNotExistsException, DeploymentPolicyNotExistsException; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5397ea/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 e13f2ae..f007632 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 @@ -131,7 +131,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void addApplication(ApplicationContext applicationContext) + public boolean addApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException { if (log.isInfoEnabled()) { @@ -155,10 +155,11 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.info(String.format("Application added successfully: [application-id] %s", applicationContext.getApplicationId())); } + return true; } @Override - public void updateApplication(ApplicationContext applicationContext) + public boolean updateApplication(ApplicationContext applicationContext) throws ApplicationDefinitionException { String applicationId = applicationContext.getApplicationId(); @@ -204,6 +205,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.info(String.format("Application added successfully: [application-id] %s", applicationId)); } + return true; } @Override @@ -448,20 +450,20 @@ public class AutoscalerServiceImpl implements AutoscalerService { } } - public void undeployApplication(String applicationId, boolean force) { + public boolean undeployApplication(String applicationId, boolean force) { AutoscalerContext asCtx = AutoscalerContext.getInstance(); ApplicationMonitor appMonitor = asCtx.getAppMonitor(applicationId); if (appMonitor == null) { log.info(String.format("Could not find application monitor for the application %s, hence returning", applicationId)); - return; + return false; } if (!force) { // Gracefull undeployment flow if (appMonitor.isTerminating()) { log.info("Application monitor is already in terminating, graceful undeployment is has already been attempted thus not invoking again"); - return; + return false; } else { log.info(String.format("Gracefully undeploying the application " + applicationId)); undeployApplicationGracefully(applicationId); @@ -472,7 +474,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (appMonitor.isForce()) { log.warn("Force undeployment is already in progress, hence not invoking again"); - return; + return false; } else { log.info(String.format("Previous gracefull undeployment is in progress for [application-id] %s , thus terminating instances directly", applicationId)); appMonitor.setForce(true); @@ -484,7 +486,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { undeployApplicationGracefully(applicationId); } } - + return true; } private void undeployApplicationGracefully(String applicationId) { @@ -525,7 +527,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void deleteApplication(String applicationId) { + public boolean deleteApplication(String applicationId) { try { ApplicationContext applicationContext = AutoscalerContext.getInstance().getApplicationContext(applicationId); Application application = ApplicationHolder.getApplications().getApplication(applicationId); @@ -556,9 +558,10 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.error(message, e); throw new RuntimeException(message, e); } + return true; } - public void updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException { + public boolean updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException { if (log.isDebugEnabled()) { log.debug(String.format("Updating Cluster monitor [Cluster id] %s ", clusterId)); } @@ -571,9 +574,10 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.debug(String.format("Updating Cluster monitor failed: Cluster monitor [Cluster id] %s not found.", clusterId)); } + return true; } - public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException { + public boolean addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException { if (servicegroup == null || StringUtils.isEmpty(servicegroup.getName())) { String msg = "Cartridge group can not be null service name can not be empty."; @@ -639,10 +643,11 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info(String.format("Cartridge group successfully added: [group-name] %s", servicegroup.getName())); } + return true; } @Override - public void removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException { + public boolean removeServiceGroup(String groupName) throws CartridgeGroupNotFoundException { try { if (log.isInfoEnabled()) { log.info(String.format("Starting to remove cartridge group: [group-name] %s", groupName)); @@ -664,6 +669,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.error(message, e); throw new RuntimeException(message, e); } + return true; } public ServiceGroup getServiceGroup(String name) { @@ -704,13 +710,13 @@ public class AutoscalerServiceImpl implements AutoscalerService { return false; } - public void undeployServiceGroup(String name) throws AutoScalerException { + public boolean undeployServiceGroup(String name) throws AutoScalerException { try { RegistryManager.getInstance().removeServiceGroup(name); } catch (RegistryException e) { throw new AutoScalerException("Error occurred while removing the cartridge groups", e); } - + return true; } @Override @@ -724,13 +730,14 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void addApplicationPolicy(ApplicationPolicy applicationPolicy) + public boolean addApplicationPolicy(ApplicationPolicy applicationPolicy) throws RemoteException, InvalidApplicationPolicyException { // validating application policy AutoscalerUtil.validateApplicationPolicy(applicationPolicy); // Add application policy to the registry PolicyManager.getInstance().addApplicationPolicy(applicationPolicy); + return true; } @Override @@ -739,12 +746,13 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException { + public boolean removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException { PolicyManager.getInstance().removeApplicationPolicy(applicationPolicyId); + return true; } @Override - public void updateApplicationPolicy(ApplicationPolicy applicationPolicy) + public boolean updateApplicationPolicy(ApplicationPolicy applicationPolicy) throws InvalidApplicationPolicyException, RemoteException, ApplicatioinPolicyNotExistsException { if (applicationPolicy == null) { @@ -766,6 +774,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { // updating application policy PolicyManager.getInstance().updateApplicationPolicy(applicationPolicy); + return true; } @Override @@ -818,13 +827,12 @@ public class AutoscalerServiceImpl implements AutoscalerService { log.error(String.format("Forcefull termination of member %s is failed, but continuing forcefull deletion of other members", memberIdToTerminate)); } } - } } @Override - public void addDeployementPolicy(DeploymentPolicy deploymentPolicy) throws RemoteException, + public boolean addDeployementPolicy(DeploymentPolicy deploymentPolicy) throws RemoteException, InvalidDeploymentPolicyException, DeploymentPolicyAlreadyExistsException { validateDeploymentPolicy(deploymentPolicy); @@ -850,6 +858,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info("Successfully added deployment policy: [deployment-policy-id] " + deploymentPolicyID); } + return true; } private void validateDeploymentPolicy(DeploymentPolicy deploymentPolicy) throws @@ -936,7 +945,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void updateDeploymentPolicy(DeploymentPolicy deploymentPolicy) throws RemoteException, + public boolean updateDeploymentPolicy(DeploymentPolicy deploymentPolicy) throws RemoteException, InvalidDeploymentPolicyException, DeploymentPolicyNotExistsException, InvalidPolicyException, CloudControllerConnectionException { validateDeploymentPolicy(deploymentPolicy); @@ -965,6 +974,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info("Successfully updated deployment policy: [deployment-policy-id] " + deploymentPolicyID); } + return true; } private void updateClusterMonitors(DeploymentPolicy deploymentPolicy) throws InvalidDeploymentPolicyException, @@ -1073,7 +1083,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public void removeDeployementPolicy(String deploymentPolicyID) throws DeploymentPolicyNotExistsException { + public boolean removeDeployementPolicy(String deploymentPolicyID) throws DeploymentPolicyNotExistsException { if (log.isInfoEnabled()) { log.info("Removing deployment policy: [deployment-policy_id] " + deploymentPolicyID); } @@ -1086,7 +1096,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (log.isInfoEnabled()) { log.info("Successfully removed deployment policy: [deployment_policy_id] " + deploymentPolicyID); } - + return true; } @Override
