fixing build failure and refactoring
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6c10e524 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6c10e524 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6c10e524 Branch: refs/heads/master Commit: 6c10e5243dfaabbf697b2591ca81ab59d92b2bc3 Parents: 8f5bc8b Author: reka <[email protected]> Authored: Wed Dec 3 12:08:55 2014 +0530 Committer: reka <[email protected]> Committed: Wed Dec 3 12:09:19 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/api/AutoScalerServiceImpl.java | 1 + .../org/apache/stratos/autoscaler/monitor/Monitor.java | 12 ++++++++---- .../manager/client/CloudControllerServiceClient.java | 4 ++++ .../publisher/InstanceNotificationPublisher.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41.java | 6 +++--- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 8 ++++++++ 6 files changed, 25 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index a08172f..977844d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -144,6 +144,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { @Override public boolean undeployDeploymentPolicy(String deploymentPolicyName) { + //PolicyManager.getInstance().undeployDeploymentPolicy(deploymentPolicyName); return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java index 617c2d3..7f17a07 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java @@ -19,7 +19,6 @@ package org.apache.stratos.autoscaler.monitor; import org.apache.stratos.autoscaler.monitor.component.ParentComponentMonitor; -import org.apache.stratos.messaging.domain.instance.GroupInstance; import org.apache.stratos.messaging.domain.instance.Instance; import java.util.ArrayList; @@ -141,6 +140,7 @@ public abstract class Monitor implements EventHandler { /** * This will add the instance + * * @param instance instance to be added */ public void addInstance(Instance instance) { @@ -150,6 +150,7 @@ public abstract class Monitor implements EventHandler { /** * Using instanceId, instance can be retrieved + * * @param instanceId instance id * @return the instance */ @@ -159,6 +160,7 @@ public abstract class Monitor implements EventHandler { /** * This will remove the instance + * * @param instanceId instance id */ public void removeInstance(String instanceId) { @@ -167,13 +169,14 @@ public abstract class Monitor implements EventHandler { /** * This will return all the instances which has the same parent id as given + * * @param parentInstanceId parent instance id * @return all the instances */ public List<String> getInstancesByParentInstanceId(String parentInstanceId) { List<String> instances = new ArrayList<String>(); - for(Instance instance : this.instanceIdToInstanceMap.values()) { - if(instance.getParentId().equals(parentInstanceId)) { + for (Instance instance : this.instanceIdToInstanceMap.values()) { + if (instance.getParentId().equals(parentInstanceId)) { instances.add(instance.getInstanceId()); } } @@ -182,10 +185,11 @@ public abstract class Monitor implements EventHandler { /** * This will check whether instances are there in the map + * * @return true/false */ public boolean hasInstance() { - if(this.instanceIdToInstanceMap.isEmpty()) { + if (this.instanceIdToInstanceMap.isEmpty()) { return true; } else { return false; http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java index 78e5307..1594dc4 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java @@ -99,6 +99,10 @@ public class CloudControllerServiceClient { public void deployServiceGroup (ServiceGroup serviceGroup) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException { stub.deployServiceGroup(serviceGroup); } + + public void undeployDeploymentPOlicy (ServiceGroup serviceGroup) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException { + stub.deployServiceGroup(serviceGroup); + } public void undeployServiceGroup (String name)throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException { stub.undeployServiceGroup(name); http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java index c932e98..4001f5c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/InstanceNotificationPublisher.java @@ -80,6 +80,6 @@ public class InstanceNotificationPublisher { public void sendInstanceCleanupEventForCluster(String clusterId) { log.info(String.format("Publishing Instance Cleanup Event: [cluster] %s", clusterId)); - publish(new InstanceCleanupClusterEvent(clusterId)); + publish(new InstanceCleanupClusterEvent(clusterId, null)); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/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 252ee58..4be676d 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 @@ -326,12 +326,12 @@ public class StratosApiV41 extends AbstractApi { } @DELETE - @Path("/deploymentPolicies/{deploymentPolicyName}") + @Path("/deploymentPolicies/{applicationId}") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/cartridgeDefinition") - public Response unDeployDeploymentPolicy(@PathParam("deploymentPolicyName") String cartridgeType) throws RestAPIException { - StratosApiV41Utils.undeployCartridge(cartridgeType); + public Response unDeployDeploymentPolicy(@PathParam("applicationId") String applicationId) throws RestAPIException { + StratosApiV41Utils.undeployDeploymentPolicy(applicationId); return Response.noContent().build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/6c10e524/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 67f7830..9ac723d 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 @@ -243,6 +243,14 @@ public class StratosApiV41Utils { return commonPolicies.toArray(new DeploymentPolicy[0]); } + public static void undeployDeploymentPolicy(String applicationId) throws RestAPIException { + CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); + if (cloudControllerServiceClient != null) { + } + + + } + public static void undeployCartridge(String cartridgeType) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
