You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/20 15:01:23 UTC
[7/8] git commit: fixing findbug issues on toString methods
fixing findbug issues on toString methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3bb2e474
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3bb2e474
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3bb2e474
Branch: refs/heads/master
Commit: 3bb2e47461cfad6a6376f35fe044720fa947085c
Parents: d0664e9
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 19:10:04 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 19:25:47 2013 -0500
----------------------------------------------------------------------
.../client/cloud/controller/CloudControllerClient.java | 4 ++++
.../autoscaler/deployment/policy/DeploymentPolicy.java | 5 ++---
.../org/apache/stratos/autoscaler/policy/PolicyManager.java | 9 +++++----
.../apache/stratos/autoscaler/registry/RegistryManager.java | 6 ++----
4 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 14903d9..11c5500 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -45,6 +45,10 @@ public class CloudControllerClient {
private static final Log log = LogFactory.getLog(CloudControllerClient.class);
private static CloudControllerServiceStub stub;
+ /* An instance of a CloudControllerClient is created when the class is loaded.
+ * Since the class is loaded only once, it is guaranteed that an object of
+ * CloudControllerClient is created only once. Hence it is singleton.
+ */
private static class InstanceHolder {
private static final CloudControllerClient INSTANCE = new CloudControllerClient();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
index d930cb6..cedc716 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
@@ -63,8 +63,7 @@ public class DeploymentPolicy implements Serializable{
this.partitionGroups = groups;
}
- @SuppressWarnings("unchecked")
- public Partition[] getAllPartitions() {
+ public Partition[] getAllPartitions() {
ArrayList<Partition> partitionslist = new ArrayList<Partition>();
for (PartitionGroup partitionGroup : this.getPartitionGroups()) {
Partition[] partitions = partitionGroup.getPartitions();
@@ -101,7 +100,7 @@ public class DeploymentPolicy implements Serializable{
}
public String toString() {
- return "Deployment Policy: " + this.id;
+ return "Deployment Policy [id]" + this.id + " [partitions] " + Arrays.toString(this.getAllPartitions());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
index f0f4e57..3d21996 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
@@ -19,10 +19,7 @@
package org.apache.stratos.autoscaler.policy;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -33,7 +30,6 @@ import org.apache.stratos.autoscaler.exception.InvalidPolicyException;
import org.apache.stratos.autoscaler.partition.PartitionManager;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
-import org.apache.stratos.autoscaler.util.AutoScalerConstants;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
/**
@@ -47,6 +43,11 @@ public class PolicyManager {
private static Map<String, DeploymentPolicy> deploymentPolicyListMap = new HashMap<String, DeploymentPolicy>();
+ /* An instance of a PolicyManager is created when the class is loaded.
+ * Since the class is loaded only once, it is guaranteed that an object of
+ * PolicyManager is created only once. Hence it is singleton.
+ */
+
private static class InstanceHolder {
private static final PolicyManager INSTANCE = new PolicyManager();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 9a40c83..f886a6c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -114,8 +114,7 @@ public class RegistryManager {
String resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.DEPLOYMENT_POLICY_RESOURCE + "/" + deploymentPolicy.getId();
persist(deploymentPolicy, resourcePath);
if(log.isDebugEnabled()) {
- log.debug(String.format("Deployment policy written to registry: [id] %s [partitions] %s",
- deploymentPolicy.getId(), deploymentPolicy.getAllPartitions()));
+ log.debug(deploymentPolicy.toString());
}
}
@@ -248,8 +247,7 @@ public class RegistryManager {
if (dataObj instanceof DeploymentPolicy) {
depPolicy = (DeploymentPolicy) dataObj;
if(log.isDebugEnabled()) {
- log.debug(String.format("Deployment policy read from registry: [id] %s [partitions] %s",
- depPolicy.getId(), depPolicy.getAllPartitions()));
+ log.debug(depPolicy.toString());
}
depPolicyList.add(depPolicy);
} else {