You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/12 10:32:24 UTC
[2/3] stratos git commit: Fixing the warnings and inspect code issues
Fixing the warnings and inspect code issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aa25af52
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aa25af52
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aa25af52
Branch: refs/heads/master
Commit: aa25af52828524017cc1cc4217b8105cbb18b750
Parents: 7d932cd
Author: reka <rt...@gmail.com>
Authored: Mon May 11 17:04:17 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue May 12 14:02:03 2015 +0530
----------------------------------------------------------------------
.../group/GroupStatusActiveProcessor.java | 21 +++++++--------
.../group/GroupStatusInactiveProcessor.java | 15 +++++------
.../group/GroupStatusProcessorChain.java | 17 ++++++------
.../group/GroupStatusTerminatedProcessor.java | 28 +++++++++-----------
.../group/GroupStatusTerminatingProcessor.java | 22 +++++++--------
5 files changed, 49 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa25af52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
index e8c5b0b..b6b0a97 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusActiveProcessor.java
@@ -46,7 +46,7 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
boolean statusChanged;
statusChanged = doProcess(idOfComponent, appId, instanceId);
if (statusChanged) {
- return statusChanged;
+ return true;
}
if (nextProcessor != null) {
@@ -54,13 +54,13 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
return nextProcessor.process(idOfComponent, appId, instanceId);
} else {
- log.warn(String.format("No possible state change found for [component] %s [instance]",
+ log.warn(String.format("No possible state change found for [component] %s [instance] %s",
idOfComponent, instanceId));
}
return false;
}
-
+ @SuppressWarnings("unchecked")
private boolean doProcess(String idOfComponent, String appId, String instanceId) {
ParentComponent component;
Map<String, Group> groups;
@@ -72,14 +72,13 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
}
try {
ApplicationHolder.acquireWriteLock();
- if (idOfComponent.equals(appId)) {
+
+ Application application = ApplicationHolder.getApplications().
+ getApplication(appId);
+ component = application;
+ if (!idOfComponent.equals(appId)) {
//it is an application
- component = ApplicationHolder.getApplications().
- getApplication(appId);
- } else {
- //it is a group
- component = ApplicationHolder.getApplications().
- getApplication(appId).getGroupRecursively(idOfComponent);
+ component = application.getGroupRecursively(idOfComponent);
}
//finding all the children of the application/group
groups = component.getAliasToGroupMap();
@@ -98,7 +97,7 @@ public class GroupStatusActiveProcessor extends GroupStatusProcessor {
" [instance] " + instanceId);
ApplicationBuilder.handleApplicationInstanceActivatedEvent(appId, instanceId);
return true;
- } else if (component instanceof Group) {
+ } else {
//send activation to the parent
log.info("Sending group instance active for [group] " +
component.getUniqueIdentifier() + " [instance] " + instanceId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa25af52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
index a69db5a..7706bb8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java
@@ -65,7 +65,7 @@ public class GroupStatusInactiveProcessor extends GroupStatusProcessor {
return false;
}
-
+ @SuppressWarnings("unchecked")
private boolean doProcess(String idOfComponent, String appId, String instanceId) {
ParentComponent component;
Map<String, Group> groups;
@@ -78,15 +78,14 @@ public class GroupStatusInactiveProcessor extends GroupStatusProcessor {
try {
ApplicationHolder.acquireWriteLock();
- if (idOfComponent.equals(appId)) {
+ Application application = ApplicationHolder.getApplications().
+ getApplication(appId);
+ component = application;
+ if (!idOfComponent.equals(appId)) {
//it is an application
- component = ApplicationHolder.getApplications().
- getApplication(appId);
- } else {
- //it is a group
- component = ApplicationHolder.getApplications().
- getApplication(appId).getGroupRecursively(idOfComponent);
+ component = application.getGroupRecursively(idOfComponent);
}
+
//finding all the children of the application/group
groups = component.getAliasToGroupMap();
clusterData = component.getClusterDataMap();
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa25af52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
index f43d2bd..feddaf5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
@@ -28,23 +28,22 @@ import org.apache.stratos.autoscaler.status.processor.StatusProcessorChain;
public class GroupStatusProcessorChain extends StatusProcessorChain {
private static final Log log = LogFactory.getLog(GroupStatusActiveProcessor.class);
- private GroupStatusActiveProcessor groupStatusActiveProcessor;
- private GroupStatusTerminatedProcessor groupStatusTerminatedProcessor;
- private GroupStatusTerminatingProcessor groupStatusTerminatingProcessor;
- private GroupStatusInactiveProcessor groupStatusInactiveProcessor;
-
@Override
public void initialize() {
- groupStatusActiveProcessor = new GroupStatusActiveProcessor();
+ GroupStatusActiveProcessor groupStatusActiveProcessor =
+ new GroupStatusActiveProcessor();
add(groupStatusActiveProcessor);
- groupStatusTerminatedProcessor = new GroupStatusTerminatedProcessor();
+ GroupStatusTerminatedProcessor groupStatusTerminatedProcessor =
+ new GroupStatusTerminatedProcessor();
add(groupStatusTerminatedProcessor);
- groupStatusTerminatingProcessor = new GroupStatusTerminatingProcessor();
+ GroupStatusTerminatingProcessor groupStatusTerminatingProcessor =
+ new GroupStatusTerminatingProcessor();
add(groupStatusTerminatingProcessor);
- groupStatusInactiveProcessor = new GroupStatusInactiveProcessor();
+ GroupStatusInactiveProcessor groupStatusInactiveProcessor =
+ new GroupStatusInactiveProcessor();
add(groupStatusInactiveProcessor);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa25af52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
index 8cade3c..fc1a736 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatedProcessor.java
@@ -31,6 +31,7 @@ import java.util.Map;
/**
* Cluster Terminated status processor
*/
+@SuppressWarnings("ALL")
public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
private static final Log log = LogFactory.getLog(GroupStatusTerminatedProcessor.class);
private GroupStatusProcessor nextProcessor;
@@ -46,7 +47,7 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
boolean statusChanged;
statusChanged = doProcess(idOfComponent, appId, instanceId);
if (statusChanged) {
- return statusChanged;
+ return true;
}
if (nextProcessor != null) {
@@ -54,13 +55,13 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
return nextProcessor.process(idOfComponent, appId, instanceId);
} else {
- log.warn(String.format("No possible state change found for [component] %s [instance]",
+ log.warn(String.format("No possible state change found for [component] %s [instance] %s",
idOfComponent, instanceId));
}
return false;
}
-
+ @SuppressWarnings("unchecked")
private boolean doProcess(String idOfComponent, String appId, String instanceId) {
ParentComponent component;
Map<String, Group> groups;
@@ -73,16 +74,17 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
try {
ApplicationHolder.acquireWriteLock();
- if (idOfComponent.equals(appId)) {
+
+ Application application = ApplicationHolder.getApplications().
+ getApplication(appId);
+ component = application;
+ if (!idOfComponent.equals(appId)) {
//it is an application
- component = ApplicationHolder.getApplications().
- getApplication(appId);
- } else {
- //it is a group
- component = ApplicationHolder.getApplications().
- getApplication(appId).getGroupRecursively(idOfComponent);
+ component = application.getGroupRecursively(idOfComponent);
}
+
//finding all the children of the application/group
+ //noinspection unchecked
groups = component.getAliasToGroupMap();
clusterData = component.getClusterDataMap();
@@ -98,7 +100,7 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
+ " [instance] " + instanceId);
ApplicationBuilder.handleApplicationInstanceTerminatedEvent(appId, instanceId);
return true;
- } else if (component instanceof Group) {
+ } else {
log.info("Sending group instance terminated for [group] " +
component.getUniqueIdentifier() + " [instance] " + instanceId);
ApplicationBuilder.handleGroupInstanceTerminatedEvent(appId,
@@ -106,14 +108,10 @@ public class GroupStatusTerminatedProcessor extends GroupStatusProcessor {
return true;
}
}
-
-
} finally {
ApplicationHolder.releaseWriteLock();
}
-
-
return false;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa25af52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatingProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatingProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatingProcessor.java
index fd83833..4be8aba 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatingProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusTerminatingProcessor.java
@@ -46,7 +46,7 @@ public class GroupStatusTerminatingProcessor extends GroupStatusProcessor {
boolean statusChanged;
statusChanged = doProcess(idOfComponent, appId, instanceId);
if (statusChanged) {
- return statusChanged;
+ return true;
}
if (nextProcessor != null) {
@@ -54,13 +54,13 @@ public class GroupStatusTerminatingProcessor extends GroupStatusProcessor {
return nextProcessor.process(idOfComponent, appId, instanceId);
} else {
- log.warn(String.format("No possible state change found for [component] %s [instance]",
+ log.warn(String.format("No possible state change found for [component] %s [instance] %s",
idOfComponent, instanceId));
}
return false;
}
-
+ @SuppressWarnings("unchecked")
private boolean doProcess(String idOfComponent, String appId, String instanceId) {
ParentComponent component;
Map<String, Group> groups;
@@ -73,15 +73,15 @@ public class GroupStatusTerminatingProcessor extends GroupStatusProcessor {
try {
ApplicationHolder.acquireWriteLock();
- if (idOfComponent.equals(appId)) {
+
+ Application application = ApplicationHolder.getApplications().
+ getApplication(appId);
+ component = application;
+ if (!idOfComponent.equals(appId)) {
//it is an application
- component = ApplicationHolder.getApplications().
- getApplication(appId);
- } else {
- //it is a group
- component = ApplicationHolder.getApplications().
- getApplication(appId).getGroupRecursively(idOfComponent);
+ component = application.getGroupRecursively(idOfComponent);
}
+
//finding all the children of the application/group
groups = component.getAliasToGroupMap();
clusterData = component.getClusterDataMap();
@@ -98,7 +98,7 @@ public class GroupStatusTerminatingProcessor extends GroupStatusProcessor {
+ appId + " and for " + " [instance] " + instanceId);
ApplicationBuilder.handleApplicationInstanceTerminatedEvent(appId, instanceId);
return true;
- } else if (component instanceof Group) {
+ } else {
//send activation to the parent
log.info("Sending group terminating for [group] " +
component.getUniqueIdentifier() + " and for [instance] "