FOrmat recent code and organize imports in autoscaler component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ab5867a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ab5867a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ab5867a Branch: refs/heads/master Commit: 5ab5867a8e5385dbb75f8f29238e143586454605 Parents: 4e4fcce Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Apr 29 23:28:26 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Apr 29 23:28:26 2015 +0530 ---------------------------------------------------------------------- .../applications/dependency/DependencyTree.java | 2 +- .../context/cluster/ClusterContext.java | 18 +++++++++--------- .../monitor/component/GroupMonitor.java | 2 -- .../monitor/component/ParentComponentMonitor.java | 6 +++--- .../autoscaler/pojo/policy/PolicyManager.java | 4 ++-- .../autoscaler/services/AutoscalerService.java | 1 - .../services/impl/AutoscalerServiceImpl.java | 3 +-- 7 files changed, 16 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java index f489158..945f91c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java @@ -120,7 +120,7 @@ public class DependencyTree { } //if not found in the top level search recursively for (ApplicationChildContext context : this.primaryApplicationContextList) { - if(context.getApplicationChildContextList() != null && + if (context.getApplicationChildContextList() != null && !context.getApplicationChildContextList().isEmpty()) { return findParentContextWithId(context, id, context.getApplicationChildContextList()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java index f7b4448..d39a071 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java @@ -164,8 +164,8 @@ public class ClusterContext extends AbstractClusterContext { log.info(String.format("Cluster instance context has been added to network partition," + " [application] %s [cluster] %s [cluster instance] %s " + "[network partition] %s", cluster.getAppId(), cluster.getClusterId(), - clusterInstance.getInstanceId(), - clusterInstance.getNetworkPartitionId())); + clusterInstance.getInstanceId(), + clusterInstance.getNetworkPartitionId())); } } @@ -249,7 +249,7 @@ public class ClusterContext extends AbstractClusterContext { //Getting the associated partition if (clusterInstance.getPartitionId() == null && partition == null) { String msg = "[Partition] " + clusterInstance.getPartitionId() + " for [application] " + - cluster.getAppId() +" [networkPartition] " + + cluster.getAppId() + " [networkPartition] " + clusterInstance.getNetworkPartitionId() + "is null " + "in deployment policy: [cluster-alias]: " + clusterInstance.getAlias(); log.error(msg); @@ -258,7 +258,7 @@ public class ClusterContext extends AbstractClusterContext { ClusterInstanceContext clusterInstanceContext = (ClusterInstanceContext) clusterLevelNetworkPartitionContext. - getInstanceContext(clusterInstance.getInstanceId()); + getInstanceContext(clusterInstance.getInstanceId()); int maxInstances = 1; if (clusterInstanceContext == null) { int minInstances = 1; @@ -363,8 +363,8 @@ public class ClusterContext extends AbstractClusterContext { clusterLevelPartitionContext.addActiveMember(memberContext); if (log.isDebugEnabled()) { String msg = String.format("Active member read from topology and added " + - "to active member list: [application] %s [cluster] %s " + - "[clusterInstanceContext] %s [partitionContext] %s [member-id] %s", + "to active member list: [application] %s [cluster] %s " + + "[clusterInstanceContext] %s [partitionContext] %s [member-id] %s", cluster.getAppId(), cluster.getClusterId(), ClusterInstanceId, clusterLevelPartitionContext.getPartitionId(), member.toString()); log.debug(msg); @@ -374,8 +374,8 @@ public class ClusterContext extends AbstractClusterContext { clusterLevelPartitionContext.addPendingMember(memberContext); if (log.isDebugEnabled()) { String msg = String.format("Pending member read from topology and added to " + - "pending member list: [application] %s [cluster] %s " + - "[clusterInstanceContext] %s [partitionContext] %s [member-id] %s", + "pending member list: [application] %s [cluster] %s " + + "[clusterInstanceContext] %s [partitionContext] %s [member-id] %s", cluster.getAppId(), cluster.getClusterId(), ClusterInstanceId, clusterLevelPartitionContext.getPartitionId(), member.toString()); log.debug(msg); @@ -384,7 +384,7 @@ public class ClusterContext extends AbstractClusterContext { clusterLevelPartitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); if (log.isInfoEnabled()) { log.info(String.format("Member stat context has been added: [application] %s " + - "[cluster] %s [clusterInstanceContext] %s [partitionContext] %s [member-id] %s", + "[cluster] %s [clusterInstanceContext] %s [partitionContext] %s [member-id] %s", cluster.getAppId(), cluster.getClusterId(), ClusterInstanceId, clusterLevelPartitionContext.getPartitionId(), memberId)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index 5e49e13..56837f5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -917,8 +917,6 @@ public class GroupMonitor extends ParentComponentMonitor { } - - @Override public void destroy() { stopScheduler(); http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 8c25447..d5831ba 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -550,7 +550,7 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable public boolean verifyGroupStatus(String childId, String instanceId, GroupStatus requiredStatus) { Monitor monitor = this.getMonitor(childId); - if(!(monitor instanceof GroupMonitor)) { + if (!(monitor instanceof GroupMonitor)) { return false; } List<String> groupInstances; @@ -576,8 +576,8 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable } if (!groupInstances.isEmpty()) { - GroupLevelNetworkPartitionContext networkPartitionContext = - (GroupLevelNetworkPartitionContext) ((GroupMonitor)monitor). + GroupLevelNetworkPartitionContext networkPartitionContext = + (GroupLevelNetworkPartitionContext) ((GroupMonitor) monitor). getNetworkPartitionCtxts().get(networkPartitionId); int minInstances = networkPartitionContext.getMinInstanceCount(); //if terminated all the instances in this instances map should be in terminated state http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/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 262e5dc..20c1a76 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 @@ -80,7 +80,7 @@ public class PolicyManager { } // Add the policy to information model and persist. - public boolean addAutoscalePolicy(AutoscalePolicy policy) throws AutoScalingPolicyAlreadyExistException{ + public boolean addAutoscalePolicy(AutoscalePolicy policy) throws AutoScalingPolicyAlreadyExistException { if (log.isInfoEnabled()) { log.info(String.format("Adding autoscaling policy: [id] %s", policy.getId())); } @@ -185,7 +185,7 @@ public class PolicyManager { } } - public void addASPolicyToInformationModel(AutoscalePolicy asPolicy) throws AutoScalingPolicyAlreadyExistException{ + public void addASPolicyToInformationModel(AutoscalePolicy asPolicy) throws AutoScalingPolicyAlreadyExistException { if (!autoscalePolicyListMap.containsKey(asPolicy.getId())) { if (log.isDebugEnabled()) { log.debug("Adding autoscaling policy: " + asPolicy.getId()); http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/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 7726068..2794ef3 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 @@ -33,7 +33,6 @@ import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; -import org.apache.stratos.autoscaler.exception.policy.UnremovablePolicyException; import org.apache.stratos.common.Properties; import java.rmi.RemoteException; http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab5867a/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 f6523d7..2844a88 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 @@ -44,7 +44,6 @@ import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor; import org.apache.stratos.autoscaler.monitor.component.ApplicationMonitor; import org.apache.stratos.autoscaler.pojo.Dependencies; import org.apache.stratos.autoscaler.pojo.ServiceGroup; -import org.apache.stratos.autoscaler.exception.policy.PolicyDoesNotExistException; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy; @@ -88,7 +87,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public boolean addAutoScalingPolicy(AutoscalePolicy autoscalePolicy) throws AutoScalingPolicyAlreadyExistException{ + public boolean addAutoScalingPolicy(AutoscalePolicy autoscalePolicy) throws AutoScalingPolicyAlreadyExistException { return PolicyManager.getInstance().addAutoscalePolicy(autoscalePolicy); }
