You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/07 07:53:58 UTC
[5/7] stratos git commit: Format autoscaler component code
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
index 3a0a549..1fff70f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
@@ -44,7 +44,7 @@ public class OAuthAdminServiceClient {
public OAuthAdminServiceClient(String epr) throws AxisFault {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- int autosclaerSocketTimeout = conf.getInt("autoscaler.identity.clientTimeout", 180000);
+ int autosclaerSocketTimeout = conf.getInt("autoscaler.identity.clientTimeout", 180000);
try {
ServerConfiguration serverConfig = CarbonUtils.getServerConfiguration();
@@ -76,7 +76,7 @@ public class OAuthAdminServiceClient {
synchronized (OAuthAdminServiceClient.class) {
if (serviceClient == null) {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
- String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
+ String hostname = conf.getString("autoscaler.identity.hostname", "localhost");
int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT);
String epr = "https://" + hostname + ":" + port + "/" + AutoscalerConstants.OAUTH_SERVICE_SFX;
serviceClient = new OAuthAdminServiceClient(epr);
@@ -91,7 +91,7 @@ public class OAuthAdminServiceClient {
oAuthConsumerDTO.setApplicationName(appName);
oAuthConsumerDTO.setOAuthVersion(OAUTH_2_0);
oAuthConsumerDTO.setGrantTypes(GRANT_TYPE);
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Trying to register oAuth application [%s]", appName));
}
stub.registerOAuthApplicationData(oAuthConsumerDTO);
@@ -102,7 +102,7 @@ public class OAuthAdminServiceClient {
}
public void removeOauthApplication(String appName) throws RemoteException, OAuthAdminServiceException {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Removing oAuth application %s", appName));
}
stub.removeOAuthApplicationData(appName);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/Utility.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/Utility.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/Utility.java
index 5e13139..e3e7228 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/Utility.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/Utility.java
@@ -48,7 +48,7 @@ public class Utility {
* as a claim in order to validate the user. This is an alternative to mutual auth.
*
* @param serviceClient Service client.
- * @param username username which is set in header.
+ * @param username username which is set in header.
*/
public static void setAuthHeaders(ServiceClient serviceClient, String username) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/ASPolicyCommands.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/ASPolicyCommands.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/ASPolicyCommands.java
index 4e0c66a..d44f377 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/ASPolicyCommands.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/ASPolicyCommands.java
@@ -25,30 +25,30 @@ import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.apache.commons.lang.StringUtils;
-
-public class ASPolicyCommands implements CommandProvider{
-
+
+public class ASPolicyCommands implements CommandProvider {
+
public String getHelp() {
- return "\nlistASPolicies - List AutoScaling policies deployed to AutoScaler. \n"
- + "\t parameters : \n"
- + "\t\t String policyID : ID of the AutoScaling policy.\n";
+ return "\nlistASPolicies - List AutoScaling policies deployed to AutoScaler. \n"
+ + "\t parameters : \n"
+ + "\t\t String policyID : ID of the AutoScaling policy.\n";
}
-
- public void _listASPolicies (CommandInterpreter ci){
- String policyId = ci.nextArgument();
-
- PolicyManager pm = PolicyManager.getInstance();
-
- if(StringUtils.isBlank(policyId)){
- AutoscalePolicy[] aspolicyArr = pm.getAutoscalePolicyList();
- for(AutoscalePolicy asPoolicy : aspolicyArr){
- ci.println(asPoolicy.toString());
- }
- }else{
- AutoscalePolicy asPolicy = pm.getAutoscalePolicy(policyId);
- if(asPolicy != null){
- ci.println(asPolicy);
- }
- }
+
+ public void _listASPolicies(CommandInterpreter ci) {
+ String policyId = ci.nextArgument();
+
+ PolicyManager pm = PolicyManager.getInstance();
+
+ if (StringUtils.isBlank(policyId)) {
+ AutoscalePolicy[] aspolicyArr = pm.getAutoscalePolicyList();
+ for (AutoscalePolicy asPoolicy : aspolicyArr) {
+ ci.println(asPoolicy.toString());
+ }
+ } else {
+ AutoscalePolicy asPolicy = pm.getAutoscalePolicy(policyId);
+ if (asPolicy != null) {
+ ci.println(asPolicy);
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java
index 0760e5f..51e9d16 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/AutoscalerContext.java
@@ -41,17 +41,17 @@ import java.util.Map;
* It holds all cluster monitors which are active in stratos.
*/
public class AutoscalerContext {
-
- private static final Log log = LogFactory.getLog(AutoscalerContext.class);
-
- private static final String AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP = "AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP";
- private static final String AS_CLUSTER_ID_TO_CLUSTER_MONITOR_MAP = "AS_CLUSTER_ID_TO_CLUSTER_MONITOR_MAP";
- private static final String AS_APPLICATION_ID_TO_APPLICATION_MONITOR_MAP = "AS_APPLICATION_ID_TO_APPLICATION_MONITOR_MAP";
- private static final String AS_PENDING_APPLICATION_MONITOR_LIST = "AS_PENDING_APPLICATION_MONITOR_LIST";
- private static final String AS_APPLICATIOIN_ID_TO_NETWORK_PARTITION_ALGO_CTX_MAP = "AS_APPLICATIOIN_ID_TO_NETWORK_PARTITION_ALGO_CTX_MAP";
- private boolean clustered;
- private boolean coordinator;
-
+
+ private static final Log log = LogFactory.getLog(AutoscalerContext.class);
+
+ private static final String AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP = "AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP";
+ private static final String AS_CLUSTER_ID_TO_CLUSTER_MONITOR_MAP = "AS_CLUSTER_ID_TO_CLUSTER_MONITOR_MAP";
+ private static final String AS_APPLICATION_ID_TO_APPLICATION_MONITOR_MAP = "AS_APPLICATION_ID_TO_APPLICATION_MONITOR_MAP";
+ private static final String AS_PENDING_APPLICATION_MONITOR_LIST = "AS_PENDING_APPLICATION_MONITOR_LIST";
+ private static final String AS_APPLICATIOIN_ID_TO_NETWORK_PARTITION_ALGO_CTX_MAP = "AS_APPLICATIOIN_ID_TO_NETWORK_PARTITION_ALGO_CTX_MAP";
+ private boolean clustered;
+ private boolean coordinator;
+
private static volatile AutoscalerContext instance;
private final transient DistributedObjectProvider distributedObjectProvider;
@@ -67,7 +67,7 @@ public class AutoscalerContext {
private Map<String, NetworkPartitionAlgorithmContext> applicationIdToNetworkPartitionAlgorithmContextMap;
private AutoscalerContext() {
- // Check clustering status
+ // Check clustering status
AxisConfiguration axisConfiguration = ServiceReferenceHolder.getInstance().getAxisConfiguration();
if ((axisConfiguration != null) && (axisConfiguration.getClusteringAgent() != null)) {
clustered = true;
@@ -75,9 +75,9 @@ public class AutoscalerContext {
// Initialize distributed object provider
distributedObjectProvider = ServiceReferenceHolder.getInstance().getDistributedObjectProvider();
-
- applicationContextMap = readApplicationContextsFromRegistry();
- if(applicationContextMap == null) {
+
+ applicationContextMap = readApplicationContextsFromRegistry();
+ if (applicationContextMap == null) {
applicationContextMap = distributedObjectProvider.getMap(AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP);//new ConcurrentHashMap<String, ApplicationContext>();
}
setClusterMonitors(distributedObjectProvider.getMap(AS_CLUSTER_ID_TO_CLUSTER_MONITOR_MAP));
@@ -88,22 +88,22 @@ public class AutoscalerContext {
private Map<String, ApplicationContext> readApplicationContextsFromRegistry() {
String[] resourcePaths = RegistryManager.getInstance().getApplicationContextResourcePaths();
- if((resourcePaths == null) || (resourcePaths.length == 0)) {
+ if ((resourcePaths == null) || (resourcePaths.length == 0)) {
return null;
}
Map<String, ApplicationContext> applicationContextMap = distributedObjectProvider.getMap(AS_APPLICATION_ID_TO_APPLICATION_CTX_MAP);//new ConcurrentHashMap<String, ApplicationContext>();
- for(String resourcePath : resourcePaths) {
+ for (String resourcePath : resourcePaths) {
ApplicationContext applicationContext = RegistryManager.getInstance().getApplicationContextByResourcePath(resourcePath);
applicationContextMap.put(applicationContext.getApplicationId(), applicationContext);
}
return applicationContextMap;
}
-
+
public static AutoscalerContext getInstance() {
- if(instance == null) {
+ if (instance == null) {
synchronized (AutoscalerContext.class) {
- if(instance == null) {
+ if (instance == null) {
instance = new AutoscalerContext();
}
}
@@ -189,7 +189,7 @@ public class AutoscalerContext {
applicationContextMap.put(applicationContext.getApplicationId(), applicationContext);
RegistryManager.getInstance().persistApplicationContext(applicationContext);
}
-
+
public boolean isClustered() {
return clustered;
}
@@ -201,59 +201,58 @@ public class AutoscalerContext {
public void setCoordinator(boolean coordinator) {
this.coordinator = coordinator;
}
-
- public void addNetworkPartitionAlgorithmContext(NetworkPartitionAlgorithmContext algorithmContext) {
- String applicationId = algorithmContext.getApplicationId();
- if (log.isInfoEnabled()) {
- log.info(String.format("Adding network partition algorithm context : [application-id] %s", applicationId));
- }
- this.addNetworkPartitionAlgorithmContextToInformationModel(algorithmContext);
- RegistryManager.getInstance().persistNetworkPartitionAlgorithmContext(algorithmContext);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("network partition algorithm context is added successfully: [application-policy-id] %s", applicationId));
- }
-
- }
-
- public boolean removeNetworkPartitionAlgorithmContext(String applicationId) {
- if (StringUtils.isEmpty(applicationId)) {
- throw new AutoScalerException("Application id cannot be empty");
- }
- this.removeNetworkPartitionAlgorithmContextInInformationModel(applicationId);
- RegistryManager.getInstance().removeNetworkPartitionAlgorithmContext(applicationId);
- if (log.isInfoEnabled()) {
- log.info(String.format("Network partition algorithm context is removed successfully: [id] %s", applicationId));
- }
- return true;
- }
-
- private void removeNetworkPartitionAlgorithmContextInInformationModel(String applicationId) {
- if (applicationIdToNetworkPartitionAlgorithmContextMap.containsKey(applicationId)) {
- if (log.isDebugEnabled()) {
- log.debug("Removing network partition algorithm context [application-id] " + applicationId);
- }
- applicationIdToNetworkPartitionAlgorithmContextMap.remove(applicationId);
- }
- else{
- throw new AutoScalerException("No such application id [" + applicationId + "] exists");
- }
- }
-
- private void addNetworkPartitionAlgorithmContextToInformationModel(NetworkPartitionAlgorithmContext algorithmContext) {
- String applicationId = algorithmContext.getApplicationId();
+
+ public void addNetworkPartitionAlgorithmContext(NetworkPartitionAlgorithmContext algorithmContext) {
+ String applicationId = algorithmContext.getApplicationId();
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Adding network partition algorithm context : [application-id] %s", applicationId));
+ }
+ this.addNetworkPartitionAlgorithmContextToInformationModel(algorithmContext);
+ RegistryManager.getInstance().persistNetworkPartitionAlgorithmContext(algorithmContext);
+
+ if (log.isInfoEnabled()) {
+ log.info(String.format("network partition algorithm context is added successfully: [application-policy-id] %s", applicationId));
+ }
+
+ }
+
+ public boolean removeNetworkPartitionAlgorithmContext(String applicationId) {
+ if (StringUtils.isEmpty(applicationId)) {
+ throw new AutoScalerException("Application id cannot be empty");
+ }
+ this.removeNetworkPartitionAlgorithmContextInInformationModel(applicationId);
+ RegistryManager.getInstance().removeNetworkPartitionAlgorithmContext(applicationId);
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Network partition algorithm context is removed successfully: [id] %s", applicationId));
+ }
+ return true;
+ }
+
+ private void removeNetworkPartitionAlgorithmContextInInformationModel(String applicationId) {
+ if (applicationIdToNetworkPartitionAlgorithmContextMap.containsKey(applicationId)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Removing network partition algorithm context [application-id] " + applicationId);
+ }
+ applicationIdToNetworkPartitionAlgorithmContextMap.remove(applicationId);
+ } else {
+ throw new AutoScalerException("No such application id [" + applicationId + "] exists");
+ }
+ }
+
+ private void addNetworkPartitionAlgorithmContextToInformationModel(NetworkPartitionAlgorithmContext algorithmContext) {
+ String applicationId = algorithmContext.getApplicationId();
if (!applicationIdToNetworkPartitionAlgorithmContextMap.containsKey(applicationId)) {
if (log.isDebugEnabled()) {
log.debug("Adding network partition algorithm context : " + applicationId);
}
applicationIdToNetworkPartitionAlgorithmContextMap.put(applicationId, algorithmContext);
} else {
- String errMsg = "Network partition algorithm context already exists : " + applicationId;
- log.error(errMsg);
+ String errMsg = "Network partition algorithm context already exists : " + applicationId;
+ log.error(errMsg);
throw new AutoScalerException(errMsg);
}
}
-
+
public NetworkPartitionAlgorithmContext getNetworkPartitionAlgorithmContext(String applicationId) {
return applicationIdToNetworkPartitionAlgorithmContextMap.get(applicationId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
index 69f87a2..2165e6b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java
@@ -43,7 +43,7 @@ public class AbstractClusterContext implements Serializable {
protected Map<String, ClusterInstance> clusterInstanceMap;
- public AbstractClusterContext(String clusterId, String serviceId){
+ public AbstractClusterContext(String clusterId, String serviceId) {
this.clusterId = clusterId;
this.serviceId = serviceId;
clusterInstanceMap = new HashMap<String, ClusterInstance>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/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 296e43f..00fb279 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
@@ -276,7 +276,7 @@ public class ClusterContext extends AbstractClusterContext {
//Retrieving the actual partition from application
Partition[] partitions;
try {
-
+
partitions = AutoscalerObjectConverter.convertCCPartitionsToPartitions(
CloudControllerServiceClient.getInstance().getNetworkPartition(nPartitionId).getPartitions());
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java
index d1d9775..89f283e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java
@@ -37,7 +37,7 @@ public class ClusterContextFactory {
if (null == cluster) {
return null;
}
-
+
String autoscalePolicyName = cluster.getAutoscalePolicyName();
AutoscalePolicy autoscalePolicy = PolicyManager.getInstance().getAutoscalePolicy(autoscalePolicyName);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
index 411d48d..8edb71b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
@@ -466,9 +466,9 @@ public class ClusterInstanceContext extends InstanceContext {
return averageRequestServedPerInstanceReset;
}
- public boolean hasScalingDependants() {
- return hasScalingDependants;
- }
+ public boolean hasScalingDependants() {
+ return hasScalingDependants;
+ }
public String getClusterId() {
return clusterId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
index e128c2c..63d6385 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/group/GroupInstanceContext.java
@@ -46,8 +46,8 @@ public class GroupInstanceContext extends InstanceContext {
public GroupLevelPartitionContext getPartitionCtxt(String partitionId) {
- for(GroupLevelPartitionContext partitionContext : partitionCtxts){
- if(partitionContext.getPartitionId().equals(partitionId)){
+ for (GroupLevelPartitionContext partitionContext : partitionCtxts) {
+ if (partitionContext.getPartitionId().equals(partitionId)) {
return partitionContext;
}
}
@@ -60,8 +60,8 @@ public class GroupInstanceContext extends InstanceContext {
public int getNonTerminatedMemberCountOfPartition(String partitionId) {
- for(GroupLevelPartitionContext partitionContext : partitionCtxts){
- if(partitionContext.getPartitionId().equals(partitionId)){
+ for (GroupLevelPartitionContext partitionContext : partitionCtxts) {
+ if (partitionContext.getPartitionId().equals(partitionId)) {
return partitionContext.getNonTerminatedInstanceCount();
}
}
@@ -70,8 +70,8 @@ public class GroupInstanceContext extends InstanceContext {
public int getActiveMemberCount(String currentPartitionId) {
- for(GroupLevelPartitionContext partitionContext : partitionCtxts){
- if(partitionContext.getPartitionId().equals(currentPartitionId)){
+ for (GroupLevelPartitionContext partitionContext : partitionCtxts) {
+ if (partitionContext.getPartitionId().equals(currentPartitionId)) {
return partitionContext.getActiveInstanceCount();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
index 5032f0b..39affd3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
@@ -84,24 +84,24 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
this.pendingMembers = new ArrayList<MemberContext>();
}
- public void terminateAllRemainingInstances(){
+ public void terminateAllRemainingInstances() {
// Forcefully deleting remaining active members
- for (Iterator<MemberContext> iterator = activeMembers.iterator(); iterator.hasNext();) {
+ for (Iterator<MemberContext> iterator = activeMembers.iterator(); iterator.hasNext(); ) {
MemberContext member = iterator.next();
iterator.remove();
terminateForcefully(member.getMemberId());
}
// Forcefully deleting remaining pending members
- for (Iterator<MemberContext> iterator = pendingMembers.iterator(); iterator.hasNext();) {
+ for (Iterator<MemberContext> iterator = pendingMembers.iterator(); iterator.hasNext(); ) {
MemberContext member = iterator.next();
iterator.remove();
terminateForcefully(member.getMemberId());
}
/// Forcefully deleting remaining termination pending members
- for (Iterator<MemberContext> iterator = terminationPendingMembers.iterator(); iterator.hasNext();) {
+ for (Iterator<MemberContext> iterator = terminationPendingMembers.iterator(); iterator.hasNext(); ) {
MemberContext member = iterator.next();
// Remove the current element from the iterator and the list.
iterator.remove();
@@ -110,18 +110,17 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
// Forcefully deleting remaining obsolete members
- for (Map.Entry<String, MemberContext> entry : obsoletedMembers.entrySet())
- {
+ for (Map.Entry<String, MemberContext> entry : obsoletedMembers.entrySet()) {
MemberContext ObsoleteMemberContext = entry.getValue();
obsoletedMembers.remove(entry.getKey());
terminateForcefully(ObsoleteMemberContext.getMemberId());
}
}
- private void terminateForcefully(String memberId) {
+ private void terminateForcefully(String memberId) {
try {
- if(log.isDebugEnabled()){
- log.debug(String.format("Forcefully terminating member [member-id] %s" , memberId));
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Forcefully terminating member [member-id] %s", memberId));
}
CloudControllerServiceClient.getInstance().terminateInstanceForcefully(memberId);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
index e6a9860..11cbf6c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
@@ -81,7 +81,7 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
pendingInstanceExpiryTime = instanceExpiryTime;
}
- public GroupLevelPartitionContext(int max, String partitionId, String networkPartitionIid ) {
+ public GroupLevelPartitionContext(int max, String partitionId, String networkPartitionIid) {
super(max, partitionId, networkPartitionIid);
this.pendingInstances = new ArrayList<Instance>();
this.activeInstances = new ArrayList<Instance>();
@@ -110,7 +110,7 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
th3.start();*/
}
- public GroupLevelPartitionContext(String partitionId, String networkPartitionIid ) {
+ public GroupLevelPartitionContext(String partitionId, String networkPartitionIid) {
super(partitionId, networkPartitionIid);
this.pendingInstances = new ArrayList<Instance>();
this.activeInstances = new ArrayList<Instance>();
@@ -125,7 +125,7 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
pendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_MEMBER_EXPIRY_TIMEOUT, 900000);
obsoltedInstanceExpiryTime = conf.getLong(StratosConstants.OBSOLETED_MEMBER_EXPIRY_TIMEOUT, 86400000);
terminationPendingInstanceExpiryTime = conf.getLong(StratosConstants.PENDING_TERMINATION_MEMBER_EXPIRY_TIMEOUT, 1800000);
-
+
if (log.isDebugEnabled()) {
log.debug("Instance expiry time is set to: " + pendingInstanceExpiryTime);
log.debug("Instance obsolete expiry time is set to: " + obsoltedInstanceExpiryTime);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ApplicationLevelNetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ApplicationLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ApplicationLevelNetworkPartitionContext.java
index 3e3edf5..57360ee 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ApplicationLevelNetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ApplicationLevelNetworkPartitionContext.java
@@ -28,7 +28,6 @@ import java.util.Map;
/**
* Holds runtime data of a network partition.
- *
*/
public class ApplicationLevelNetworkPartitionContext extends NetworkPartitionContext implements Serializable {
private static final Log log = LogFactory.getLog(ApplicationLevelNetworkPartitionContext.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
index 21234b0..cc0dd58 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Holds runtime data of a network partition.
- *
*/
public class ClusterLevelNetworkPartitionContext extends NetworkPartitionContext implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java
index 4749e23..2446c95 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java
@@ -50,7 +50,6 @@ public class GroupLevelNetworkPartitionContext extends NetworkPartitionContext i
private int currentPartitionIndex;
-
public GroupLevelNetworkPartitionContext(String id, String partitionAlgo) {
super(id);
this.partitionAlgorithm = partitionAlgo;
@@ -69,7 +68,6 @@ public class GroupLevelNetworkPartitionContext extends NetworkPartitionContext i
}
-
public int getMinInstanceCount() {
return minInstanceCount;
}
@@ -217,6 +215,4 @@ public class GroupLevelNetworkPartitionContext extends NetworkPartitionContext i
}
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
index 270a2ab..c6ec135 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
@@ -69,14 +69,14 @@ public class ClusterStatusEventPublisher {
Service service = TopologyManager.getTopology().getService(serviceName);
if (service != null) {
Cluster cluster = service.getCluster(clusterId);
- if (cluster.isStateTransitionValid(ClusterStatus.Created, null)){
- if(cluster.getStatus(null) != ClusterStatus.Created) {
+ if (cluster.isStateTransitionValid(ClusterStatus.Created, null)) {
+ if (cluster.getStatus(null) != ClusterStatus.Created) {
ClusterStatusClusterResetEvent clusterCreatedEvent =
new ClusterStatusClusterResetEvent(appId, serviceName, clusterId, instanceId);
publishEvent(clusterCreatedEvent);
} else {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.warn("Cluster is already created, [cluster] " + clusterId);
}
}
@@ -96,14 +96,14 @@ public class ClusterStatusEventPublisher {
Service service = TopologyManager.getTopology().getService(serviceName);
if (service != null) {
Cluster cluster = service.getCluster(clusterId);
- if(cluster.getInstanceContexts(instanceId) == null) {
- log.warn("The Instance context for the cluster already exists for [cluster] " +
- clusterId + " [instance-id] " + instanceId);
+ if (cluster.getInstanceContexts(instanceId) == null) {
+ log.warn("The Instance context for the cluster already exists for [cluster] " +
+ clusterId + " [instance-id] " + instanceId);
return;
}
ClusterStatusClusterInstanceCreatedEvent clusterInstanceCreatedEvent =
new ClusterStatusClusterInstanceCreatedEvent(alias, serviceName,
- clusterId, instanceId);
+ clusterId, instanceId);
publishEvent(clusterInstanceCreatedEvent);
} else {
@@ -124,15 +124,15 @@ public class ClusterStatusEventPublisher {
if (service != null) {
Cluster cluster = service.getCluster(clusterId);
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
- if (clusterInstance.isStateTransitionValid(ClusterStatus.Active)){
- if(clusterInstance.getStatus() != ClusterStatus.Active) {
+ if (clusterInstance.isStateTransitionValid(ClusterStatus.Active)) {
+ if (clusterInstance.getStatus() != ClusterStatus.Active) {
ClusterStatusClusterActivatedEvent clusterActivatedEvent =
new ClusterStatusClusterActivatedEvent(appId, serviceName,
clusterId, instanceId);
publishEvent(clusterActivatedEvent);
} else {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.warn("Cluster is already active [cluster] " + clusterId);
}
}
@@ -153,17 +153,17 @@ public class ClusterStatusEventPublisher {
if (service != null) {
Cluster cluster = service.getCluster(clusterId);
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
- if (clusterInstance.isStateTransitionValid(ClusterStatus.Inactive)){
- if(clusterInstance.getStatus() != ClusterStatus.Inactive) {
- ClusterStatusClusterInactivateEvent clusterInactivateEvent =
- new ClusterStatusClusterInactivateEvent(appId, serviceName, clusterId, instanceId);
+ if (clusterInstance.isStateTransitionValid(ClusterStatus.Inactive)) {
+ if (clusterInstance.getStatus() != ClusterStatus.Inactive) {
+ ClusterStatusClusterInactivateEvent clusterInactivateEvent =
+ new ClusterStatusClusterInactivateEvent(appId, serviceName, clusterId, instanceId);
- publishEvent(clusterInactivateEvent);
- } else {
- if(log.isDebugEnabled()){
- log.warn("Cluster is already inactive [cluster] " + clusterId);
- }
+ publishEvent(clusterInactivateEvent);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.warn("Cluster is already inactive [cluster] " + clusterId);
}
+ }
} else {
log.warn("Inactive is not in the possible state list of [cluster] " + clusterId);
}
@@ -185,8 +185,8 @@ public class ClusterStatusEventPublisher {
Cluster cluster = service.getCluster(clusterId);
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
- if(clusterInstance != null){
- if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminating)){
+ if (clusterInstance != null) {
+ if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminating)) {
if (clusterInstance.getStatus() != ClusterStatus.Terminating) {
ClusterStatusClusterTerminatingEvent appStatusClusterTerminatingEvent =
new ClusterStatusClusterTerminatingEvent(appId, serviceName, clusterId, instanceId);
@@ -217,19 +217,19 @@ public class ClusterStatusEventPublisher {
if (service != null) {
Cluster cluster = service.getCluster(clusterId);
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
- if(clusterInstance == null) {
+ if (clusterInstance == null) {
log.warn(String.format("Cluster instance not found: [instance-id] %s", instanceId));
return;
}
- if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)){
- if(clusterInstance.getStatus() != ClusterStatus.Terminated) {
+ if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)) {
+ if (clusterInstance.getStatus() != ClusterStatus.Terminated) {
ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent =
new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId);
publishEvent(appStatusClusterTerminatedEvent);
} else {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.warn("Cluster is already terminated, [cluster] " + clusterId);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java
index ccfc2b6..94af7c1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/InstanceNotificationPublisher.java
@@ -47,7 +47,7 @@ public class InstanceNotificationPublisher {
String topic = MessagingUtil.getMessageTopicName(event);
EventPublisher instanceNotifyingEvent = EventPublisherPool.
- getPublisher(topic);
+ getPublisher(topic);
instanceNotifyingEvent.publish(event);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
index 8538f06..4cfbb67 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java
@@ -73,10 +73,10 @@ public class AutoscalerHealthStatEventReceiver {
private boolean terminated = false;
private HealthStatEventReceiver healthStatEventReceiver;
- private ExecutorService executorService;
+ private ExecutorService executorService;
public AutoscalerHealthStatEventReceiver() {
- this.healthStatEventReceiver = new HealthStatEventReceiver();
+ this.healthStatEventReceiver = new HealthStatEventReceiver();
addEventListeners();
}
@@ -86,10 +86,10 @@ public class AutoscalerHealthStatEventReceiver {
Thread.sleep(15000);
} catch (InterruptedException ignore) {
}
- healthStatEventReceiver.setExecutorService(executorService);
+ healthStatEventReceiver.setExecutorService(executorService);
healthStatEventReceiver.execute();
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Autoscaler health stat event receiver thread started");
}
@@ -109,7 +109,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -129,7 +129,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -171,7 +171,7 @@ public class AutoscalerHealthStatEventReceiver {
}
return;
}
- if(monitor instanceof ClusterMonitor) {
+ if (monitor instanceof ClusterMonitor) {
ClusterMonitor vmClusterMonitor = (ClusterMonitor) monitor;
vmClusterMonitor.handleAverageRequestsServingCapabilityEvent(averageRequestsServingCapabilityEvent);
}
@@ -189,7 +189,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -208,7 +208,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -227,7 +227,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -250,7 +250,7 @@ public class AutoscalerHealthStatEventReceiver {
if (!member.isActive()) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member activated event has not received for the member %s. "
- + "Therefore ignoring" + " the health stat", memberId));
+ + "Therefore ignoring" + " the health stat", memberId));
}
return;
}
@@ -261,7 +261,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -284,7 +284,7 @@ public class AutoscalerHealthStatEventReceiver {
if (!member.isActive()) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member activated event has not received for the member %s. "
- + "Therefore ignoring" + " the health stat", memberId));
+ + "Therefore ignoring" + " the health stat", memberId));
}
return;
}
@@ -295,7 +295,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -322,7 +322,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -345,7 +345,7 @@ public class AutoscalerHealthStatEventReceiver {
if (!member.isActive()) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member activated event has not received for the member %s. "
- + "Therefore ignoring" + " the health stat", memberId));
+ + "Therefore ignoring" + " the health stat", memberId));
}
return;
}
@@ -356,7 +356,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -380,7 +380,7 @@ public class AutoscalerHealthStatEventReceiver {
if (!member.isActive()) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member activated event has not received for the member %s. "
- + "Therefore ignoring" + " the health stat", memberId));
+ + "Therefore ignoring" + " the health stat", memberId));
}
return;
}
@@ -391,7 +391,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -414,7 +414,7 @@ public class AutoscalerHealthStatEventReceiver {
if (!member.isActive()) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member activated event has not received for the member %s. "
- + "Therefore ignoring" + " the health stat", memberId));
+ + "Therefore ignoring" + " the health stat", memberId));
}
return;
}
@@ -425,7 +425,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -451,7 +451,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -470,7 +470,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -490,7 +490,7 @@ public class AutoscalerHealthStatEventReceiver {
if (null == monitor) {
if (log.isDebugEnabled()) {
log.debug(String.format("A cluster monitor is not found in autoscaler context "
- + "[cluster] %s", clusterId));
+ + "[cluster] %s", clusterId));
}
return;
}
@@ -519,11 +519,11 @@ public class AutoscalerHealthStatEventReceiver {
this.terminated = true;
}
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index 7b9bbc8..7c1e750 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -117,11 +117,11 @@ public class AutoscalerTopologyEventReceiver {
if (applications != null) {
for (Application application : applications.getApplications().values()) {
if (AutoscalerUtil.allClustersInitialized(application)) {
- ApplicationContext applicationContext = AutoscalerContext.getInstance().
- getApplicationContext(application.getUniqueIdentifier());
- if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
- AutoscalerUtil.getInstance().startApplicationMonitor(application.getUniqueIdentifier());
- } else {
+ ApplicationContext applicationContext = AutoscalerContext.getInstance().
+ getApplicationContext(application.getUniqueIdentifier());
+ if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
+ AutoscalerUtil.getInstance().startApplicationMonitor(application.getUniqueIdentifier());
+ } else {
log.info("The application is not yet " +
"deployed for this [application] " +
application.getUniqueIdentifier());
@@ -155,19 +155,19 @@ public class AutoscalerTopologyEventReceiver {
String appId = applicationClustersCreatedEvent.getAppId();
boolean appMonitorCreationTriggered = false;
int retries = 5;
- while(!appMonitorCreationTriggered && retries > 0){
+ while (!appMonitorCreationTriggered && retries > 0) {
try {
//acquire read lock
ApplicationHolder.acquireReadLock();
//start the application monitor
ApplicationContext applicationContext = AutoscalerContext.getInstance().getApplicationContext(appId);
if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) {
- if (!AutoscalerContext.getInstance().containsApplicationPendingMonitor(appId)) {
- appMonitorCreationTriggered = true;
- AutoscalerUtil.getInstance().startApplicationMonitor(appId);
- break;
- }
- }
+ if (!AutoscalerContext.getInstance().containsApplicationPendingMonitor(appId)) {
+ appMonitorCreationTriggered = true;
+ AutoscalerUtil.getInstance().startApplicationMonitor(appId);
+ break;
+ }
+ }
} catch (Exception e) {
String msg = "Error processing event " + e.getLocalizedMessage();
log.error(msg, e);
@@ -175,22 +175,22 @@ public class AutoscalerTopologyEventReceiver {
//release read lock
ApplicationHolder.releaseReadLock();
}
-
+
try {
- retries--;
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
+ retries--;
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
}
-
+
// Reason is to re-try 5 time is because application status might not become "deployed" yet, refer deployApplication API for more information.
// Reason why not throwing error after 5 times is because this not the only place we trigger app-monitor creation.
if (!appMonitorCreationTriggered) {
- String msg = String.format("Application monitor creation is not triggered on application "
- + "clusters created event even after 5 retries [application-id] %s. "
- + "Possible cause is either application context is null or application status didn't become %s yet.", appId, ApplicationContext.STATUS_DEPLOYED);
- log.warn(msg);
- }
+ String msg = String.format("Application monitor creation is not triggered on application "
+ + "clusters created event even after 5 retries [application-id] %s. "
+ + "Possible cause is either application context is null or application status didn't become %s yet.", appId, ApplicationContext.STATUS_DEPLOYED);
+ log.warn(msg);
+ }
} catch (ClassCastException e) {
String msg = "Error while casting the event " + e.getLocalizedMessage();
log.error(msg, e);
@@ -343,7 +343,7 @@ public class AutoscalerTopologyEventReceiver {
monitor.notifyParentMonitor(ClusterStatus.Terminated, instanceId);
//Removing the instance and instanceContext
ClusterInstance instance = (ClusterInstance) monitor.getInstance(instanceId);
- ((ClusterContext)monitor.getClusterContext()).
+ ((ClusterContext) monitor.getClusterContext()).
getNetworkPartitionCtxt(instance.getNetworkPartitionId()).
removeInstanceContext(instanceId);
monitor.removeInstance(instanceId);
@@ -360,7 +360,7 @@ public class AutoscalerTopologyEventReceiver {
@Override
protected void onEvent(Event event) {
try {
- log.info("[MemberReadyToShutdownEvent] Received: " + event.getClass());
+ log.info("[MemberReadyToShutdownEvent] Received: " + event.getClass());
MemberReadyToShutdownEvent memberReadyToShutdownEvent = (MemberReadyToShutdownEvent) event;
String clusterId = memberReadyToShutdownEvent.getClusterId();
AutoscalerContext asCtx = AutoscalerContext.getInstance();
@@ -462,79 +462,79 @@ public class AutoscalerTopologyEventReceiver {
});
topologyEventReceiver.addEventListener(new ClusterInstanceCreatedEventListener() {
- @Override
- protected void onEvent(Event event) {
-
- ClusterInstanceCreatedEvent clusterInstanceCreatedEvent =
- (ClusterInstanceCreatedEvent) event;
- ClusterMonitor clusterMonitor = AutoscalerContext.getInstance().
- getClusterMonitor(clusterInstanceCreatedEvent.getClusterId());
- ClusterInstance clusterInstance = ((ClusterInstanceCreatedEvent) event).
- getClusterInstance();
- String instanceId = clusterInstance.getInstanceId();
- //FIXME to take lock when clusterMonitor is running
- if (clusterMonitor != null) {
- TopologyManager.acquireReadLockForCluster(clusterInstanceCreatedEvent.getServiceName(),
- clusterInstanceCreatedEvent.getClusterId());
-
- try {
- Service service = TopologyManager.getTopology().
- getService(clusterInstanceCreatedEvent.getServiceName());
-
- if (service != null) {
- Cluster cluster = service.getCluster(clusterInstanceCreatedEvent.getClusterId());
- if (cluster != null) {
- try {
- ClusterContext clusterContext =
- (ClusterContext) clusterMonitor.getClusterContext();
- if (clusterContext == null) {
- clusterContext = ClusterContextFactory.getVMClusterContext(instanceId, cluster,
- clusterMonitor.hasScalingDependents());
- clusterMonitor.setClusterContext(clusterContext);
-
- }
- log.info(" Cluster monitor has scaling dependents"
- + " ["+clusterMonitor.hasScalingDependents()+"] "); // TODO -- remove this log..
- clusterContext.addInstanceContext(instanceId, cluster,
- clusterMonitor.hasScalingDependents(), clusterMonitor.groupScalingEnabledSubtree());
- if (clusterMonitor.getInstance(instanceId) == null) {
- // adding the same instance in topology to monitor as a reference
- ClusterInstance clusterInstance1 = cluster.getInstanceContexts(instanceId);
- clusterMonitor.addInstance(clusterInstance1);
- }
-
- if (clusterMonitor.hasMonitoringStarted().compareAndSet(false, true)) {
- clusterMonitor.startScheduler();
- log.info("Monitoring task for Cluster Monitor with cluster id "
- + clusterInstanceCreatedEvent.getClusterId() + " started successfully");
- } else {
- //monitor already started. Invoking it directly to speed up the process
- ((ClusterMonitor)clusterMonitor).monitor();
- }
- } catch (PolicyValidationException e) {
- log.error(e.getMessage(), e);
- } catch (PartitionValidationException e) {
- log.error(e.getMessage(), e);
- }
- }
-
- } else {
- log.error("Service " + clusterInstanceCreatedEvent.getServiceName() +
- " not found, no cluster instance added to ClusterMonitor " +
- clusterInstanceCreatedEvent.getClusterId());
- }
-
- } finally {
- TopologyManager.releaseReadLockForCluster(clusterInstanceCreatedEvent.getServiceName(),
- clusterInstanceCreatedEvent.getClusterId());
- }
-
- } else {
- log.error("No Cluster Monitor found for cluster id " +
- clusterInstanceCreatedEvent.getClusterId());
- }
- }
- }
+ @Override
+ protected void onEvent(Event event) {
+
+ ClusterInstanceCreatedEvent clusterInstanceCreatedEvent =
+ (ClusterInstanceCreatedEvent) event;
+ ClusterMonitor clusterMonitor = AutoscalerContext.getInstance().
+ getClusterMonitor(clusterInstanceCreatedEvent.getClusterId());
+ ClusterInstance clusterInstance = ((ClusterInstanceCreatedEvent) event).
+ getClusterInstance();
+ String instanceId = clusterInstance.getInstanceId();
+ //FIXME to take lock when clusterMonitor is running
+ if (clusterMonitor != null) {
+ TopologyManager.acquireReadLockForCluster(clusterInstanceCreatedEvent.getServiceName(),
+ clusterInstanceCreatedEvent.getClusterId());
+
+ try {
+ Service service = TopologyManager.getTopology().
+ getService(clusterInstanceCreatedEvent.getServiceName());
+
+ if (service != null) {
+ Cluster cluster = service.getCluster(clusterInstanceCreatedEvent.getClusterId());
+ if (cluster != null) {
+ try {
+ ClusterContext clusterContext =
+ (ClusterContext) clusterMonitor.getClusterContext();
+ if (clusterContext == null) {
+ clusterContext = ClusterContextFactory.getVMClusterContext(instanceId, cluster,
+ clusterMonitor.hasScalingDependents());
+ clusterMonitor.setClusterContext(clusterContext);
+
+ }
+ log.info(" Cluster monitor has scaling dependents"
+ + " [" + clusterMonitor.hasScalingDependents() + "] "); // TODO -- remove this log..
+ clusterContext.addInstanceContext(instanceId, cluster,
+ clusterMonitor.hasScalingDependents(), clusterMonitor.groupScalingEnabledSubtree());
+ if (clusterMonitor.getInstance(instanceId) == null) {
+ // adding the same instance in topology to monitor as a reference
+ ClusterInstance clusterInstance1 = cluster.getInstanceContexts(instanceId);
+ clusterMonitor.addInstance(clusterInstance1);
+ }
+
+ if (clusterMonitor.hasMonitoringStarted().compareAndSet(false, true)) {
+ clusterMonitor.startScheduler();
+ log.info("Monitoring task for Cluster Monitor with cluster id "
+ + clusterInstanceCreatedEvent.getClusterId() + " started successfully");
+ } else {
+ //monitor already started. Invoking it directly to speed up the process
+ ((ClusterMonitor) clusterMonitor).monitor();
+ }
+ } catch (PolicyValidationException e) {
+ log.error(e.getMessage(), e);
+ } catch (PartitionValidationException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+
+ } else {
+ log.error("Service " + clusterInstanceCreatedEvent.getServiceName() +
+ " not found, no cluster instance added to ClusterMonitor " +
+ clusterInstanceCreatedEvent.getClusterId());
+ }
+
+ } finally {
+ TopologyManager.releaseReadLockForCluster(clusterInstanceCreatedEvent.getServiceName(),
+ clusterInstanceCreatedEvent.getClusterId());
+ }
+
+ } else {
+ log.error("No Cluster Monitor found for cluster id " +
+ clusterInstanceCreatedEvent.getClusterId());
+ }
+ }
+ }
);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/AutoScalerException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/AutoScalerException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/AutoScalerException.java
index d4ba903..b27734c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/AutoScalerException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/AutoScalerException.java
@@ -20,16 +20,16 @@ package org.apache.stratos.autoscaler.exception;
public class AutoScalerException extends RuntimeException {
- private static final long serialVersionUID = 3131046757663797684L;
+ private static final long serialVersionUID = 3131046757663797684L;
- public AutoScalerException(String msg) {
+ public AutoScalerException(String msg) {
super(msg);
}
-
+
public AutoScalerException(String msg, Exception ex) {
super(msg, ex);
}
-
+
public AutoScalerException(Exception ex) {
super(ex);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidArgumentException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidArgumentException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidArgumentException.java
index 79492a7..fa2a5e6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidArgumentException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidArgumentException.java
@@ -23,24 +23,24 @@ public class InvalidArgumentException extends Exception {
private static final long serialVersionUID = -43882156675116287L;
private String message;
-
- public InvalidArgumentException(String message) {
- super(message);
- this.message = message;
- }
-
- public InvalidArgumentException(String message,Throwable e) {
- super(message,e);
- this.message = message;
- }
-
- public InvalidArgumentException(Throwable e) {
- super(e);
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
+
+ public InvalidArgumentException(String message) {
+ super(message);
+ this.message = message;
+ }
+
+ public InvalidArgumentException(String message, Throwable e) {
+ super(message, e);
+ this.message = message;
+ }
+
+ public InvalidArgumentException(Throwable e) {
+ super(e);
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/ApplicationDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/ApplicationDefinitionException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/ApplicationDefinitionException.java
index 771c10c..b595e32 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/ApplicationDefinitionException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/ApplicationDefinitionException.java
@@ -23,21 +23,21 @@ public class ApplicationDefinitionException extends Exception {
private String message;
- public ApplicationDefinitionException () {
+ public ApplicationDefinitionException() {
super();
}
- public ApplicationDefinitionException (String message, Throwable cause) {
+ public ApplicationDefinitionException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
- public ApplicationDefinitionException (String message) {
+ public ApplicationDefinitionException(String message) {
super(message);
this.message = message;
}
- public ApplicationDefinitionException (Throwable cause) {
+ public ApplicationDefinitionException(Throwable cause) {
super(cause);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/DependencyBuilderException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/DependencyBuilderException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/DependencyBuilderException.java
index c6daaca..a4ed629 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/DependencyBuilderException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/DependencyBuilderException.java
@@ -26,17 +26,17 @@ public class DependencyBuilderException extends Exception {
private static final long serialVersionUID = -7521673271244696906L;
private String message;
- public DependencyBuilderException(String message, Exception exception){
+ public DependencyBuilderException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public DependencyBuilderException(Exception exception){
+ public DependencyBuilderException(Exception exception) {
super(exception);
}
- public DependencyBuilderException(String msg){
+ public DependencyBuilderException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/InvalidApplicationPolicyException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/InvalidApplicationPolicyException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/InvalidApplicationPolicyException.java
index bc33124..4296b5d 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/InvalidApplicationPolicyException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/InvalidApplicationPolicyException.java
@@ -18,10 +18,10 @@
*/
package org.apache.stratos.autoscaler.exception.application;
-public class InvalidApplicationPolicyException extends Exception{
+public class InvalidApplicationPolicyException extends Exception {
- private static final long serialVersionUID = -58978497283511866L;
- private String message;
+ private static final long serialVersionUID = -58978497283511866L;
+ private String message;
public InvalidApplicationPolicyException(final String message, final Exception exception) {
super(message, exception);
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/MonitorNotFoundException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/MonitorNotFoundException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/MonitorNotFoundException.java
index 325b825..b2b20eb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/MonitorNotFoundException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/MonitorNotFoundException.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.exception.application;
/**
* This will throw when required monitor not found
*/
-public class MonitorNotFoundException extends Exception{
+public class MonitorNotFoundException extends Exception {
private static final long serialVersionUID = -9163807860189126883L;
private String message;
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/TopologyInConsistentException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/TopologyInConsistentException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/TopologyInConsistentException.java
index 41dc15f..4fe4f75 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/TopologyInConsistentException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/application/TopologyInConsistentException.java
@@ -25,17 +25,17 @@ public class TopologyInConsistentException extends Exception {
private static final long serialVersionUID = -7521673271244696906L;
private String message;
- public TopologyInConsistentException(String message, Exception exception){
+ public TopologyInConsistentException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public TopologyInConsistentException(Exception exception){
+ public TopologyInConsistentException(Exception exception) {
super(exception);
}
- public TopologyInConsistentException(String msg){
+ public TopologyInConsistentException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/506affb8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/CartridgeInformationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/CartridgeInformationException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/CartridgeInformationException.java
index c99163d..565790f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/CartridgeInformationException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/cartridge/CartridgeInformationException.java
@@ -23,21 +23,21 @@ public class CartridgeInformationException extends Exception {
private String message;
- public CartridgeInformationException () {
+ public CartridgeInformationException() {
super();
}
- public CartridgeInformationException (String message, Throwable cause) {
+ public CartridgeInformationException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
- public CartridgeInformationException (String message) {
+ public CartridgeInformationException(String message) {
super(message);
this.message = message;
}
- public CartridgeInformationException (Throwable cause) {
+ public CartridgeInformationException(Throwable cause) {
super(cause);
}