You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/17 05:55:11 UTC
[1/2] stratos git commit: Fixing JSON de-serialization issue in GET
/applications method
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 5b133881d -> cd37ecda5
Fixing JSON de-serialization issue in GET /applications method
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cd37ecda
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cd37ecda
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cd37ecda
Branch: refs/heads/4.1.0-test
Commit: cd37ecda5c92236869004e7ccd2582f362e6425e
Parents: e1a0a1a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 17 10:21:12 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 17 10:21:30 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cli/pom.xml | 5 ++
.../java/org/apache/stratos/cli/RestClient.java | 3 +-
.../stratos/cli/RestCommandLineService.java | 37 +++++----
.../application/beans/CartridgeDefinition.java | 3 -
.../endpoint/util/converter/PojoConverter.java | 83 ++++++++------------
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 1 +
6 files changed, 59 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index a83c997..60467eb 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -110,6 +110,11 @@
<artifactId>httpclient</artifactId>
<version>4.3.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.manager</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
index 2cd4289..b2df173 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
@@ -211,7 +211,8 @@ public class RestClient implements GenericRestClient {
}
}
- public Object getEntity(String serviceEndpoint, Class responseJsonClass, String identifierPlaceHolder, String identifier, String entityName) {
+ public Object getEntity(String serviceEndpoint, Class responseJsonClass, String identifierPlaceHolder,
+ String identifier, String entityName) {
try {
return executeGet(serviceEndpoint.replace(identifierPlaceHolder, identifier), responseJsonClass);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 6ee2696..bb015bc 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -33,21 +33,17 @@ import org.apache.stratos.cli.exception.ExceptionMapper;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
import org.apache.stratos.cli.utils.RowMapper;
-import org.apache.stratos.common.beans.ApplicationBean;
import org.apache.stratos.common.beans.GroupBean;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.beans.UserInfoBean;
-import org.apache.stratos.common.beans.autoscaler.partition.Partition;
import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
import org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
import org.apache.stratos.common.beans.cartridge.definition.IaasProviderBean;
-import org.apache.stratos.common.beans.cartridge.definition.PortMappingBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesGroup;
import org.apache.stratos.common.beans.kubernetes.KubernetesHost;
import org.apache.stratos.common.beans.topology.Cluster;
-import org.apache.stratos.common.beans.topology.Member;
-import org.apache.stratos.manager.dto.Cartridge;
+import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -654,9 +650,9 @@ public class RestCommandLineService {
// This method helps to list applications
public void listApplications() throws CommandException {
try {
- Type listType = new TypeToken<ArrayList<ApplicationBean>>() {
+ Type listType = new TypeToken<ArrayList<ApplicationDefinition>>() {
}.getType();
- List<ApplicationBean> list = (List<ApplicationBean>) restClient.listEntity(ENDPOINT_LIST_APPLICATION,
+ List<ApplicationDefinition> list = (List<ApplicationDefinition>) restClient.listEntity(ENDPOINT_LIST_APPLICATION,
listType, "applications");
if ((list == null) || (list.size() == 0)) {
@@ -664,19 +660,22 @@ public class RestCommandLineService {
return;
}
- RowMapper<ApplicationBean> rowMapper = new RowMapper<ApplicationBean>() {
- public String[] getData(ApplicationBean definition) {
- String[] data = new String[1];
- data[0] = definition.getId();
+ RowMapper<ApplicationDefinition> rowMapper = new RowMapper<ApplicationDefinition>() {
+ public String[] getData(ApplicationDefinition applicationDefinition) {
+ String[] data = new String[4];
+ data[0] = applicationDefinition.getApplicationId();
+ data[1] = applicationDefinition.getName();
+ data[2] = applicationDefinition.getAlias();
+ data[3] = applicationDefinition.getStatus();
return data;
}
};
- ApplicationBean[] array = new ApplicationBean[list.size()];
+ ApplicationDefinition[] array = new ApplicationDefinition[list.size()];
array = list.toArray(array);
System.out.println("Applications found:");
- CliUtils.printTable(array, rowMapper, "Application ID");
+ CliUtils.printTable(array, rowMapper, "Application ID", "Name", "Alias", "Status");
} catch (Exception e) {
String message = "Error in listing applications";
System.out.println(message);
@@ -937,19 +936,19 @@ public class RestCommandLineService {
// This method helps to describe applications
public void describeApplication (String applicationID) {
try {
- Type listType = new TypeToken<ArrayList<ApplicationBean>>() {
+ Type listType = new TypeToken<ApplicationDefinition>() {
}.getType();
- List<ApplicationBean> applications = (List<ApplicationBean>) restClient
- .listEntity(ENDPOINT_GET_APPLICATION.replace("{appId}", applicationID),
- listType, "applications");
+ ApplicationDefinition application = (ApplicationDefinition) restClient
+ .getEntity(ENDPOINT_GET_APPLICATION, ApplicationDefinition.class, "{appId}", applicationID,
+ "application");
- if (applications == null) {
+ if (application == null) {
System.out.println("Application not found: " + applicationID);
return;
}
System.out.println("Application: " + applicationID);
- System.out.println(getGson().toJson(applications));
+ System.out.println(getGson().toJson(application));
} catch (Exception e) {
String message = "Error in describing application: " + applicationID;
System.out.println(message);
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
index c79f7ed..8339d65 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/CartridgeDefinition.java
@@ -28,11 +28,8 @@ public class CartridgeDefinition implements Serializable {
private static final long serialVersionUID = 8968224678298479827L;
private String type;
-
private int cartridgeMin;
-
private int cartridgeMax;
-
private SubscribableInfo subscribableInfo;
public String getType() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
index ab4a03c..f95636b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
@@ -19,66 +19,23 @@
package org.apache.stratos.rest.endpoint.util.converter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.List;
-
import org.apache.commons.lang.StringUtils;
import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelNetworkPartition;
import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelPartition;
import org.apache.stratos.autoscaler.stub.deployment.policy.ChildPolicy;
-import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
-import org.apache.stratos.autoscaler.stub.pojo.CartridgeContext;
-import org.apache.stratos.autoscaler.stub.pojo.DependencyContext;
-import org.apache.stratos.autoscaler.stub.pojo.GroupContext;
-import org.apache.stratos.autoscaler.stub.pojo.SubscribableInfoContext;
-import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig;
-import org.apache.stratos.cloud.controller.stub.domain.Container;
-import org.apache.stratos.cloud.controller.stub.domain.FloatingNetwork;
-import org.apache.stratos.cloud.controller.stub.domain.FloatingNetworks;
-import org.apache.stratos.cloud.controller.stub.domain.IaasConfig;
-import org.apache.stratos.cloud.controller.stub.domain.LoadbalancerConfig;
-import org.apache.stratos.cloud.controller.stub.domain.NetworkInterface;
-import org.apache.stratos.cloud.controller.stub.domain.NetworkInterfaces;
-import org.apache.stratos.cloud.controller.stub.domain.Persistence;
-import org.apache.stratos.cloud.controller.stub.domain.PortMapping;
+import org.apache.stratos.autoscaler.stub.pojo.*;
+import org.apache.stratos.cloud.controller.stub.domain.*;
import org.apache.stratos.cloud.controller.stub.domain.ServiceGroup;
-import org.apache.stratos.cloud.controller.stub.domain.Volume;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
-import org.apache.stratos.manager.composite.application.beans.*;
-import org.apache.stratos.manager.deploy.service.Service;
-import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions;
-import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
-import org.apache.stratos.manager.subscription.SubscriptionDomain;
-import org.apache.stratos.messaging.domain.applications.Application;
-import org.apache.stratos.messaging.domain.applications.Group;
-import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
-import org.apache.stratos.messaging.domain.instance.ClusterInstance;
-import org.apache.stratos.messaging.domain.instance.GroupInstance;
-import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.common.beans.ApplicationBean;
import org.apache.stratos.common.beans.GroupBean;
import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
import org.apache.stratos.common.beans.autoscaler.partition.Partition;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.LoadAverageThresholds;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.LoadThresholds;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.MemoryConsumptionThresholds;
-import org.apache.stratos.common.beans.autoscaler.policy.autoscale.RequestsInFlightThresholds;
+import org.apache.stratos.common.beans.autoscaler.policy.autoscale.*;
import org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.common.beans.cartridge.definition.ContainerBean;
-import org.apache.stratos.common.beans.cartridge.definition.FloatingNetworkBean;
-import org.apache.stratos.common.beans.cartridge.definition.IaasProviderBean;
-import org.apache.stratos.common.beans.cartridge.definition.LoadBalancerBean;
-import org.apache.stratos.common.beans.cartridge.definition.NetworkInterfaceBean;
-import org.apache.stratos.common.beans.cartridge.definition.PersistenceBean;
-import org.apache.stratos.common.beans.cartridge.definition.PortMappingBean;
+import org.apache.stratos.common.beans.cartridge.definition.*;
import org.apache.stratos.common.beans.cartridge.definition.PropertyBean;
-import org.apache.stratos.common.beans.cartridge.definition.ServiceDefinitionBean;
-import org.apache.stratos.common.beans.cartridge.definition.VolumeBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesGroup;
import org.apache.stratos.common.beans.kubernetes.KubernetesHost;
import org.apache.stratos.common.beans.kubernetes.KubernetesMaster;
@@ -86,6 +43,23 @@ import org.apache.stratos.common.beans.kubernetes.PortRange;
import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean;
import org.apache.stratos.common.beans.topology.Instance;
import org.apache.stratos.common.beans.topology.Member;
+import org.apache.stratos.common.util.CommonUtil;
+import org.apache.stratos.manager.composite.application.beans.*;
+import org.apache.stratos.manager.deploy.service.Service;
+import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions;
+import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
+import org.apache.stratos.manager.subscription.SubscriptionDomain;
+import org.apache.stratos.messaging.domain.applications.Application;
+import org.apache.stratos.messaging.domain.applications.Group;
+import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.List;
public class PojoConverter {
@@ -136,7 +110,9 @@ public class PojoConverter {
}
if (cartridgeDefinitionBean.getExportingProperties() != null) {
- cartridgeConfig.setExportingProperties(cartridgeDefinitionBean.getExportingProperties());
+ List<String> propertiesList = cartridgeDefinitionBean.getExportingProperties();
+ String[] propertiesArray = propertiesList.toArray(new String[propertiesList.size()]);
+ cartridgeConfig.setExportingProperties(propertiesArray);
}
if (cartridgeDefinitionBean.getContainer() != null) {
@@ -1092,7 +1068,12 @@ public class PojoConverter {
return applicationContext;
}
- public static ApplicationDefinition convertApplicationContextToApplicationDefinition(ApplicationContext applicationContext) {
+ public static ApplicationDefinition convertApplicationContextToApplicationDefinition(
+ ApplicationContext applicationContext) {
+ if(applicationContext == null) {
+ return null;
+ }
+
ApplicationDefinition applicationDefinition = new ApplicationDefinition();
applicationDefinition.setApplicationId(applicationContext.getApplicationId());
applicationDefinition.setName(applicationContext.getName());
@@ -1186,7 +1167,9 @@ public class PojoConverter {
SubscribableInfo subscribableInfo = new SubscribableInfo();
subscribableInfo.setAlias(subscribableInfoContext.getAlias());
subscribableInfo.setAutoscalingPolicy(subscribableInfoContext.getAutoscalingPolicy());
- subscribableInfo.setDependencyAliases(subscribableInfoContext.getDependencyAliases());
+ if(!CommonUtil.isEmptyArray(subscribableInfoContext.getDependencyAliases())) {
+ subscribableInfo.setDependencyAliases(subscribableInfoContext.getDependencyAliases());
+ }
subscribableInfo.setDeploymentPolicy(subscribableInfoContext.getDeploymentPolicy());
subscribableInfo.setMinMembers(subscribableInfoContext.getMinMembers());
subscribableInfo.setMaxMembers(subscribableInfoContext.getMaxMembers());
http://git-wip-us.apache.org/repos/asf/stratos/blob/cd37ecda/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index 002f034..7543f7c 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -128,6 +128,7 @@
<value>networkPartition</value>
<value>partitions</value>
<value>instances</value>
+ <value>dependencyAliases</value>
</list>
</property>
</bean>
[2/2] stratos git commit: Refining rest api domain model and changing
arrays to lists
Posted by im...@apache.org.
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/e1a0a1a2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1a0a1a2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1a0a1a2
Branch: refs/heads/4.1.0-test
Commit: e1a0a1a2dac272732c68daf25cc938fdb85b3536
Parents: 5b13388
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 17 10:13:15 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 17 10:21:30 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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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/e1a0a1a2/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));
+ }
}