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 2014/12/18 07:38:28 UTC
[26/50] [abbrv] stratos git commit: Refining rest api domain model
and changing arrays to lists
Refining rest api domain model and changing arrays to lists
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1283987d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1283987d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1283987d
Branch: refs/heads/master
Commit: 1283987d149b9be2c8fdb0885e4ad2fb573db362
Parents: 6c7cc33
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 17 10:13:15 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 18 12:06:58 2014 +0530
----------------------------------------------------------------------
.../stratos/common/beans/ApplicationBean.java | 1 +
.../stratos/common/beans/CartridgeInfoBean.java | 25 +++++++---------
.../org/apache/stratos/common/beans/Error.java | 1 +
.../apache/stratos/common/beans/GroupBean.java | 1 +
.../common/beans/SubscriptionDomainRequest.java | 1 +
.../stratos/common/beans/TenantInfoBean.java | 3 +-
.../ApplicationLevelNetworkPartition.java | 3 --
.../partition/ChildLevelNetworkPartition.java | 3 +-
.../partition/ChildLevelPartition.java | 2 +-
.../beans/autoscaler/partition/Partition.java | 4 ---
.../policy/autoscale/AutoscalePolicy.java | 5 ----
.../policy/autoscale/LoadAverageThresholds.java | 1 -
.../autoscale/MemoryConsumptionThresholds.java | 1 -
.../autoscale/RequestsInFlightThresholds.java | 1 -
.../policy/deployment/ApplicationPolicy.java | 1 -
.../policy/deployment/ChildPolicy.java | 2 +-
.../policy/deployment/DeploymentPolicy.java | 5 ----
.../definition/CartridgeDefinitionBean.java | 31 +++++---------------
.../cartridge/definition/DeploymentBean.java | 1 -
.../definition/FloatingNetworkBean.java | 1 +
.../cartridge/definition/IaasProviderBean.java | 10 -------
.../cartridge/definition/LoadBalancerBean.java | 3 --
.../definition/NetworkInterfaceBean.java | 1 +
.../cartridge/definition/PersistenceBean.java | 1 -
.../cartridge/definition/PortMappingBean.java | 2 --
.../cartridge/definition/PropertyBean.java | 1 -
.../beans/cartridge/definition/VolumeBean.java | 6 ----
.../common/beans/kubernetes/KubernetesHost.java | 1 +
.../beans/kubernetes/KubernetesMaster.java | 1 +
.../common/beans/kubernetes/PortRange.java | 1 +
.../common/beans/kubernetes/Properties.java | 17 +++++------
.../common/beans/kubernetes/Property.java | 5 +++-
.../repositoryNotificationInfoBean/Payload.java | 1 +
.../Repository.java | 1 +
.../domain/SubscriptionDomainBean.java | 1 +
.../stratos/common/beans/topology/Cluster.java | 8 -----
.../stratos/common/beans/topology/Instance.java | 1 -
.../stratos/common/beans/topology/Member.java | 2 +-
.../apache/stratos/common/util/CommonUtil.java | 4 +++
39 files changed, 52 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ApplicationBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ApplicationBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ApplicationBean.java
index d64eb23..de5fd00 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ApplicationBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/ApplicationBean.java
@@ -10,6 +10,7 @@ import java.util.List;
@XmlRootElement(name="applications")
public class ApplicationBean {
+
private String id;
private String name;
private String description;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/CartridgeInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/CartridgeInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/CartridgeInfoBean.java
index 0d3af03..8dd78e9 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/CartridgeInfoBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/CartridgeInfoBean.java
@@ -26,24 +26,21 @@ import java.util.List;
@XmlRootElement
public class CartridgeInfoBean {
- String cartridgeType;
- String alias;
- String autoscalePolicy;
- String deploymentPolicy;
- String repoURL;
- boolean privateRepo;
- String repoUsername;
- String repoPassword;
- String dataCartridgeType;
- String dataCartridgeAlias;
- boolean commitsEnabled;
+ private String cartridgeType;
+ private String alias;
+ private String autoscalePolicy;
+ private String deploymentPolicy;
+ private String repoURL;
+ private boolean privateRepo;
+ private String repoUsername;
+ private String repoPassword;
+ private String dataCartridgeType;
+ private String dataCartridgeAlias;
+ private boolean commitsEnabled;
private String serviceGroup;
-
private PersistenceBean persistence;
-
private List<PropertyBean> property;
-
private List<String> domains;
public CartridgeInfoBean() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/Error.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/Error.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/Error.java
index 568c7e0..2447f03 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/Error.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/Error.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "error")
public class Error {
+
private int errorCode;
private String errorMessage;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/GroupBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/GroupBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/GroupBean.java
index 7ed3cd4..b4c372d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/GroupBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/GroupBean.java
@@ -28,6 +28,7 @@ import java.util.List;
@XmlRootElement(name="groups")
public class GroupBean {
+
private List<GroupBean> subGroups = null;
private List<Cluster> clusters = null;
private String alias;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SubscriptionDomainRequest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SubscriptionDomainRequest.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SubscriptionDomainRequest.java
index 7ef9147..6949d97 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SubscriptionDomainRequest.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/SubscriptionDomainRequest.java
@@ -30,6 +30,7 @@ import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBea
*/
@XmlRootElement
public class SubscriptionDomainRequest {
+
private List<SubscriptionDomainBean> domains;
public List<SubscriptionDomainBean> getDomains() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
index 63276a0..5b814f8 100755
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
@@ -41,8 +41,9 @@ public class TenantInfoBean {
private String originatedService;
private String usagePlan;
+ public TenantInfoBean() {
- public TenantInfoBean(){}
+ }
/*copy constructor*/
public TenantInfoBean(TenantInfoBean tenantInfoBean) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ApplicationLevelNetworkPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ApplicationLevelNetworkPartition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ApplicationLevelNetworkPartition.java
index 0ddbb69..b3269f7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ApplicationLevelNetworkPartition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ApplicationLevelNetworkPartition.java
@@ -26,10 +26,7 @@ import java.util.List;
public class ApplicationLevelNetworkPartition {
private String id;
-
private boolean activeByDefault;
-
- //partition Ids
private List<Partition> partitions;
public String getId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelNetworkPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelNetworkPartition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelNetworkPartition.java
index d537554..2d68911 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelNetworkPartition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelNetworkPartition.java
@@ -23,10 +23,9 @@ import java.util.List;
@XmlRootElement
public class ChildLevelNetworkPartition {
- private String id;
+ private String id;
private String partitionAlgo;
-
private List<ChildLevelPartition> partitions;
public String getId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelPartition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelPartition.java
index 012c3ad..4203ba6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelPartition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/ChildLevelPartition.java
@@ -22,8 +22,8 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class ChildLevelPartition {
- private String id;
+ private String id;
private int max;
public String getId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
index c14b752..f36f893 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
@@ -28,13 +28,9 @@ import java.util.List;
public class Partition {
private String id;
-
private String description;
-
private boolean isPublic;
-
private String provider;
-
private List<PropertyBean> property;
public String getId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/AutoscalePolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/AutoscalePolicy.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/AutoscalePolicy.java
index a3aa3be..c9b4a4a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/AutoscalePolicy.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/AutoscalePolicy.java
@@ -25,15 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
public class AutoscalePolicy {
private String id;
-
private String displayName;
-
private String description;
-
private LoadThresholds loadThresholds;
-
private boolean isPublic;
-
private float instanceRoundingFactor;
public String getId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
index 6505870..9919137 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/LoadAverageThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class LoadAverageThresholds {
private float threshold;
-
private float lowerLimit;
public float getThreshold() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
index d44ce7e..431700b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class MemoryConsumptionThresholds {
private float threshold;
-
private float lowerLimit;
public float getThreshold() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
index 7433f31..64bf721 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class RequestsInFlightThresholds {
private float threshold;
-
private float lowerLimit;
public float getThreshold() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ApplicationPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ApplicationPolicy.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ApplicationPolicy.java
index 79b11e4..a1c20d2 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ApplicationPolicy.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ApplicationPolicy.java
@@ -26,7 +26,6 @@ import java.util.List;
@XmlRootElement
public class ApplicationPolicy {
-
private List<ApplicationLevelNetworkPartition> networkPartition;
public List<ApplicationLevelNetworkPartition> getNetworkPartition() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java
index 688d57a..4e47843 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java
@@ -25,8 +25,8 @@ import java.util.List;
@XmlRootElement
public class ChildPolicy {
- private String childId;
+ private String childId;
private List<ChildLevelNetworkPartition> networkPartition;
public String getChildId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/DeploymentPolicy.java
index 81bdae4..1b2e08a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/DeploymentPolicy.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/DeploymentPolicy.java
@@ -26,15 +26,10 @@ import java.util.List;
@XmlRootElement
public class DeploymentPolicy {
- //partition groups
private String applicationId;
-
private String description;
-
private boolean isPublic;
-
private ApplicationPolicy applicationPolicy;
-
private List<ChildPolicy> childPolicies;
public String getApplicationId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/CartridgeDefinitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/CartridgeDefinitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/CartridgeDefinitionBean.java
index 35e3b98..530f45a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/CartridgeDefinitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/CartridgeDefinitionBean.java
@@ -27,45 +27,28 @@ import java.util.List;
public class CartridgeDefinitionBean {
private String type;
-
private String host;
-
private String provider;
-
- //Four types - Application,Framework,Data,LB
+ /**
+ * Category: Application|Framework|Data|LoadBalancer
+ */
private String category;
-
private String displayName;
-
private String description;
-
private String version;
-
private boolean multiTenant;
-
private boolean isPublic;
-
private DeploymentBean deployment;
-
private List<PortMappingBean> portMapping;
-
private PersistenceBean persistence;
-
private List<IaasProviderBean> iaasProvider;
-
- private List<PropertyBean> property;
-
private String defaultAutoscalingPolicy;
-
private String defaultDeploymentPolicy;
-
private String serviceGroup;
-
private ContainerBean container;
-
private String deployerType;
-
- private String[] exportingProperties;
+ private List<PropertyBean> property;
+ private List<String> exportingProperties;
public String toString () {
@@ -117,11 +100,11 @@ public class CartridgeDefinitionBean {
return propertyBuilder.toString();
}
- public String[] getExportingProperties() {
+ public List<String> getExportingProperties() {
return exportingProperties;
}
- public void setExportingProperties(String[] exportingProperties) {
+ public void setExportingProperties(List<String> exportingProperties) {
this.exportingProperties = exportingProperties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/DeploymentBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/DeploymentBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/DeploymentBean.java
index 3c94ee7..5b92470 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/DeploymentBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/DeploymentBean.java
@@ -26,7 +26,6 @@ import java.util.List;
public class DeploymentBean {
private String baseDir;
-
private List<String> dir;
private String getDirectories () {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/FloatingNetworkBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/FloatingNetworkBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/FloatingNetworkBean.java
index 38eaa94..fc8ed71 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/FloatingNetworkBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/FloatingNetworkBean.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement (name = "floatingNetworks")
public class FloatingNetworkBean {
+
private String name;
private String networkUuid;
private String floatingIP;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/IaasProviderBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/IaasProviderBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/IaasProviderBean.java
index 7d05ccb..44ee6d0 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/IaasProviderBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/IaasProviderBean.java
@@ -26,23 +26,14 @@ import java.util.List;
public class IaasProviderBean {
private String type;
-
private String name;
-
private String className;
-
private String imageId;
-
private int maxInstanceLimit;
-
private String provider;
-
private String identity;
-
private String credential;
-
private List<PropertyBean> property;
-
private List<NetworkInterfaceBean> networkInterfaces;
public List<NetworkInterfaceBean> getNetworkInterfaces() {
@@ -126,7 +117,6 @@ public class IaasProviderBean {
}
private String getIaasPropertiesString () {
-
StringBuilder iaasPropertyBuilder = new StringBuilder();
if(getProperty() != null) {
for (PropertyBean propertyBean : getProperty()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/LoadBalancerBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/LoadBalancerBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/LoadBalancerBean.java
index 1797441..e8ccdc6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/LoadBalancerBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/LoadBalancerBean.java
@@ -26,11 +26,8 @@ import java.util.List;
public class LoadBalancerBean {
private String type;
-
private String deploymentPolicy;
-
private String autoscalingPolicy;
-
private List<PropertyBean> property;
public String getType() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/NetworkInterfaceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/NetworkInterfaceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/NetworkInterfaceBean.java
index ebb8c54..13d1564 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/NetworkInterfaceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/NetworkInterfaceBean.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement (name = "networkInterfaces")
public class NetworkInterfaceBean {
+
private String networkUuid;
private String fixedIp;
private String portUuid;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PersistenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PersistenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PersistenceBean.java
index f8a767c..3639ba4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PersistenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PersistenceBean.java
@@ -26,7 +26,6 @@ import java.util.List;
public class PersistenceBean {
private boolean isRequired;
-
private List<VolumeBean> volume;
public String toString () {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PortMappingBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PortMappingBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PortMappingBean.java
index bbe3056..51baf7b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PortMappingBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PortMappingBean.java
@@ -25,9 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class PortMappingBean {
private String protocol;
-
private int port;
-
private int proxyPort;
public String toString () {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PropertyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PropertyBean.java
index 72d0792..2903ae1 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PropertyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/PropertyBean.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class PropertyBean {
private String name;
-
private String value;
public String getName() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/VolumeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/VolumeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/VolumeBean.java
index 0c1eb9a..44dee99 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/VolumeBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/definition/VolumeBean.java
@@ -24,17 +24,11 @@ import javax.xml.bind.annotation.XmlRootElement;
public class VolumeBean {
private String id;
-
private String size;
-
private String device;
-
private boolean removeOnTermination;
-
private String mappingPath;
-
private String snapshotId;
-
private String volumeId;
public String toString () {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHost.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHost.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHost.java
index a8d4b05..b85e987 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHost.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHost.java
@@ -28,6 +28,7 @@ import java.util.List;
@XmlRootElement
public class KubernetesHost {
+
private String hostId;
private String hostname;
private String hostIpAddress;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMaster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMaster.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMaster.java
index d023d19..e5426e6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMaster.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMaster.java
@@ -28,6 +28,7 @@ import java.util.List;
@XmlRootElement
public class KubernetesMaster {
+
private String hostId;
private String hostname;
private String hostIpAddress;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PortRange.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PortRange.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PortRange.java
index 68cbd96..31d64e8 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PortRange.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PortRange.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class PortRange {
+
private int upper;
private int lower;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Properties.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Properties.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Properties.java
index dbacc17..c4c4f67 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Properties.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Properties.java
@@ -18,33 +18,32 @@
*/
package org.apache.stratos.common.beans.kubernetes;
+import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Arrays;
+import java.util.List;
/**
* Had to wrap {@link Property} array using a class, since there's a bug in current
* stub generation.
*/
+@XmlRootElement
public class Properties implements Serializable{
private static final long serialVersionUID = 1986895299288322592L;
- private Property[] properties;
+ private List<Property> properties;
- public Property[] getProperties() {
+ public List<Property> getProperties() {
return properties;
}
- public void setProperties(Property[] properties) {
- if(properties == null) {
- this.properties = new Property[0];
- } else {
- this.properties = Arrays.copyOf(properties, properties.length);
- }
+ public void setProperties(List<Property> properties) {
+ this.properties = properties;
}
@Override
public String toString() {
- return "Properties [properties=" + Arrays.toString(properties) + "]";
+ return "Properties [properties=" + properties + "]";
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Property.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Property.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Property.java
index 14ea390..d433dcf 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Property.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/Property.java
@@ -18,14 +18,17 @@
*/
package org.apache.stratos.common.beans.kubernetes;
+import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
/**
* Holds a property
*/
-public class Property implements Serializable{
+@XmlRootElement
+public class Property implements Serializable {
private static final long serialVersionUID = -2191782657999410197L;
+
private String name;
private String value;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Payload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Payload.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Payload.java
index bc9475b..a724a7e 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Payload.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Payload.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "payload")
public class Payload {
+
private Repository repository;
public Repository getRepository() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Repository.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Repository.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Repository.java
index 2d9b822..0d88195 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Repository.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/repositoryNotificationInfoBean/Repository.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "repository")
public class Repository {
+
private String url;
private String description;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/subscription/domain/SubscriptionDomainBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/subscription/domain/SubscriptionDomainBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/subscription/domain/SubscriptionDomainBean.java
index ee16cc2..cd3aa46 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/subscription/domain/SubscriptionDomainBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/subscription/domain/SubscriptionDomainBean.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "domains")
public class SubscriptionDomainBean {
+
private String domainName;
private String applicationContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Cluster.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Cluster.java
index 0af5718..d309432 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Cluster.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Cluster.java
@@ -27,21 +27,13 @@ import java.util.List;
public class Cluster {
private String alias;
-
private String serviceName;
-
private String clusterId;
-
private List<Member> member;
-
private String tenantRange;
-
private List<String> hostNames;
-
private boolean isLbCluster;
-
private List<PropertyBean> property;
-
private List<Instance> instances;
public List<Instance> getInstances() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Instance.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Instance.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Instance.java
index 59e311c..9c76b1c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Instance.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Instance.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Instance {
private String status;
-
private String instanceId;
public String getStatus() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
index 0bba360..7697a06 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
@@ -24,12 +24,12 @@ import org.apache.stratos.common.beans.cartridge.definition.PropertyBean;
@XmlRootElement
public class Member {
+
private String serviceName;
private String clusterId;
private String networkPartitionId;
private String partitionId;
private String memberId;
-
private String status;
private String memberIp;
private String lbClusterId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1283987d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
index 9f806f1..e0abae1 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CommonUtil.java
@@ -620,6 +620,10 @@ public class CommonUtil {
}
return true;
}
+
+ public static boolean isEmptyArray(String[] array) {
+ return (array == null) || (array.length == 0) || ((array.length == 1) && (array[0] == null));
+ }
}