You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/08/20 06:20:07 UTC
git commit: Removed unused imports and added serial version ids.
Repository: stratos
Updated Branches:
refs/heads/master dedea5205 -> 3e3277211
Removed unused imports and added serial version ids.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3e327721
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3e327721
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3e327721
Branch: refs/heads/master
Commit: 3e327721127dcee86878e0ae3dcb637203ab9538
Parents: dedea52
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Wed Aug 20 09:47:17 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Wed Aug 20 09:47:17 2014 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/manager/dao/Cluster.java | 10 +++++-----
.../apache/stratos/manager/deploy/service/Service.java | 4 +---
.../manager/deploy/service/ServiceDeploymentManager.java | 3 ++-
.../deploy/service/multitenant/MultiTenantService.java | 4 +---
.../deploy/service/multitenant/lb/DefaultLBService.java | 3 ++-
.../deploy/service/multitenant/lb/ExistingLBService.java | 4 +++-
.../manager/deploy/service/multitenant/lb/LBService.java | 5 +----
.../service/multitenant/lb/MultiTenantLBService.java | 4 +---
.../service/multitenant/lb/ServiceAwareLBService.java | 4 +++-
9 files changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dao/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dao/Cluster.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dao/Cluster.java
index c515461..98f7029 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dao/Cluster.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dao/Cluster.java
@@ -23,8 +23,8 @@ package org.apache.stratos.manager.dao;
import java.io.Serializable;
public class Cluster implements Serializable {
-
- private int id;
+ private static final long serialVersionUID = -1579127946734432357L;
+ private int id;
private String clusterDomain;
private String clusterSubDomain;
private String mgtClusterDomain;
@@ -75,9 +75,9 @@ public class Cluster implements Serializable {
this.hostName = hostName;
}
- //public int getId() {
- // return id;
- //}
+ public int getId() {
+ return id;
+ }
public void setId(int id) {
this.id = id;
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
index 1a9c76c..30b123f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
@@ -19,8 +19,6 @@
package org.apache.stratos.manager.deploy.service;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.pojo.Properties;
import org.apache.stratos.manager.behaviour.CartridgeMgtBehaviour;
@@ -33,7 +31,7 @@ import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils;
public abstract class Service extends CartridgeMgtBehaviour {
- private static Log log = LogFactory.getLog(Service.class);
+ private static final long serialVersionUID = -3261972002698749232L;
private String type;
private String autoscalingPolicyName;
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
index 752eae5..08589b3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
@@ -494,7 +494,8 @@ public class ServiceDeploymentManager {
}
}
- private static Property[] combine (Property[] propertyArray1, Property[] propertyArray2) {
+ @SuppressWarnings("unused")
+ private static Property[] combine (Property[] propertyArray1, Property[] propertyArray2) {
int length = propertyArray1.length + propertyArray2.length;
Property[] combinedProperties = new Property[length];
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
index fb77fe6..fc7a639 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
@@ -19,14 +19,12 @@
package org.apache.stratos.manager.deploy.service.multitenant;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
import org.apache.stratos.manager.deploy.service.Service;
public class MultiTenantService extends Service {
- private static Log log = LogFactory.getLog(MultiTenantService.class);
+ private static final long serialVersionUID = 3038272784193474660L;
public MultiTenantService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo,
String tenantRange) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
index 563d95c..487140c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
@@ -39,7 +39,8 @@ import java.util.Map;
public class DefaultLBService extends LBService {
- private static Log log = LogFactory.getLog(DefaultLBService.class);
+ private static final long serialVersionUID = 8650714821857129052L;
+ private static Log log = LogFactory.getLog(DefaultLBService.class);
private boolean defaultLBServiceExists = false;
public DefaultLBService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
index 5475e42..78acae7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
@@ -33,7 +33,9 @@ import java.util.Map;
public class ExistingLBService extends LBService {
- public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange) {
+ private static final long serialVersionUID = -421015139303889832L;
+
+ public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange) {
super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
index 27f2a5c..f062626 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
@@ -19,19 +19,16 @@
package org.apache.stratos.manager.deploy.service.multitenant.lb;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.pojo.Properties;
import org.apache.stratos.manager.deploy.service.Service;
import org.apache.stratos.manager.exception.ADCException;
import org.apache.stratos.manager.exception.AlreadySubscribedException;
import org.apache.stratos.manager.exception.UnregisteredCartridgeException;
-import org.apache.stratos.manager.lb.category.LoadBalancerCategory;
public class LBService extends Service {
- private static Log log = LogFactory.getLog(LBService.class);
+ private static final long serialVersionUID = 7202575406524382777L;
private String loadBalancedServiceType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
index ec200f3..993afde 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
@@ -19,8 +19,6 @@
package org.apache.stratos.manager.deploy.service.multitenant.lb;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.pojo.Properties;
import org.apache.stratos.manager.deploy.service.Service;
@@ -30,7 +28,7 @@ import org.apache.stratos.manager.lb.category.LoadBalancerCategory;
public class MultiTenantLBService extends Service {
- private static Log log = LogFactory.getLog(MultiTenantLBService.class);
+ private static final long serialVersionUID = 2930474060830972961L;
private LoadBalancerCategory loadBalancerCategory;
http://git-wip-us.apache.org/repos/asf/stratos/blob/3e327721/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
index 54427ad..f5c3ea4 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
@@ -41,7 +41,9 @@ import java.util.Map;
public class ServiceAwareLBService extends LBService {
- public ServiceAwareLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
+ private static final long serialVersionUID = -4107281204555031986L;
+
+ public ServiceAwareLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
CartridgeInfo cartridgeInfo, String tenantRange) {
super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);