Keep only InvalidApplicationPolicyException to validation failure of app policy
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dc0d23d3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dc0d23d3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dc0d23d3 Branch: refs/heads/master Commit: dc0d23d3048fcecb80efa5e81de283b442fe86be Parents: 661e8ad Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Apr 30 10:41:50 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Apr 30 10:41:50 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/internal/AutoscalerServiceComponent.java | 3 ++- .../apache/stratos/autoscaler/pojo/policy/PolicyManager.java | 8 +++++--- .../autoscaler/services/impl/AutoscalerServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0d23d3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java index 0695aa4..10fd07d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java @@ -28,6 +28,7 @@ import org.apache.stratos.autoscaler.context.AutoscalerContext; import org.apache.stratos.autoscaler.event.receiver.health.AutoscalerHealthStatEventReceiver; import org.apache.stratos.autoscaler.event.receiver.topology.AutoscalerTopologyEventReceiver; import org.apache.stratos.autoscaler.exception.AutoScalerException; +import org.apache.stratos.autoscaler.exception.application.InvalidApplicationPolicyException; import org.apache.stratos.autoscaler.exception.policy.InvalidDeploymentPolicyException; import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; @@ -152,7 +153,7 @@ public class AutoscalerServiceComponent { } private void executeCoordinatorTasks() throws InvalidPolicyException, - InvalidDeploymentPolicyException { + InvalidDeploymentPolicyException, InvalidApplicationPolicyException { // Start topology receiver asTopologyReceiver = new AutoscalerTopologyEventReceiver(); http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0d23d3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java index 20c1a76..12e66ff 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.exception.AutoScalerException; import org.apache.stratos.autoscaler.exception.AutoScalingPolicyAlreadyExistException; +import org.apache.stratos.autoscaler.exception.application.InvalidApplicationPolicyException; import org.apache.stratos.autoscaler.exception.policy.InvalidDeploymentPolicyException; import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException; import org.apache.stratos.autoscaler.exception.policy.PolicyDoesNotExistException; @@ -347,7 +348,7 @@ public class PolicyManager { } - public void addApplicationPolicy(ApplicationPolicy applicationPolicy) throws InvalidPolicyException { + public void addApplicationPolicy(ApplicationPolicy applicationPolicy) throws InvalidApplicationPolicyException { String applicationPolicyId = applicationPolicy.getId(); if (log.isInfoEnabled()) { log.info(String.format("Adding application policy : [application-policy-id] %s", applicationPolicyId)); @@ -375,7 +376,8 @@ public class PolicyManager { return true; } - public void addApplicationPolicyToInformationModel(ApplicationPolicy applicationPolicy) throws InvalidPolicyException { + public void addApplicationPolicyToInformationModel(ApplicationPolicy applicationPolicy) + throws InvalidApplicationPolicyException { String applicationPolicyId = applicationPolicy.getId(); if (!applicationPolicyListMap.containsKey(applicationPolicyId)) { if (log.isDebugEnabled()) { @@ -385,7 +387,7 @@ public class PolicyManager { } else { String errMsg = "Application policy already exists : " + applicationPolicyId; log.error(errMsg); - throw new InvalidPolicyException(errMsg); + throw new InvalidApplicationPolicyException(errMsg); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0d23d3/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 2844a88..527057b 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 @@ -726,7 +726,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { @Override public void addApplicationPolicy(ApplicationPolicy applicationPolicy) - throws RemoteException, InvalidApplicationPolicyException, InvalidPolicyException { + throws RemoteException, InvalidApplicationPolicyException { // validating application policy AutoscalerUtil.validateApplicationPolicy(applicationPolicy);
