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/16 05:01:32 UTC
stratos git commit: Fixing get applications api method
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 92b8574cc -> b9dcfb19f
Fixing get applications api method
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b9dcfb19
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b9dcfb19
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b9dcfb19
Branch: refs/heads/4.1.0-test
Commit: b9dcfb19f74db9058064118d8ab23c00dece828e
Parents: 92b8574
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Dec 16 09:31:23 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Dec 16 09:31:23 2014 +0530
----------------------------------------------------------------------
.../application/beans/ComponentDefinition.java | 5 +----
.../rest/endpoint/api/StratosApiV41.java | 3 ++-
.../rest/endpoint/api/StratosApiV41Utils.java | 1 +
.../endpoint/util/converter/PojoConverter.java | 20 +++++++++++++-------
4 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9dcfb19/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
index edf24d3..851ab1d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ComponentDefinition.java
@@ -13,9 +13,7 @@ public class ComponentDefinition implements Serializable {
private static final long serialVersionUID = -5932265453191494386L;
private List<GroupDefinition> groups;
-
private DependencyDefinitions dependencies;
-
private List<CartridgeDefinition> cartridges;
public List<GroupDefinition> getGroups() {
@@ -40,6 +38,5 @@ public class ComponentDefinition implements Serializable {
public void setCartridges(List<CartridgeDefinition> cartridges) {
this.cartridges = cartridges;
- }
-
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9dcfb19/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 3b707a3..8c12dd8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -369,7 +369,8 @@ public class StratosApiV41 extends AbstractApi {
public Response getApplications()
throws RestAPIException {
List<ApplicationDefinition> applicationDefinitions = StratosApiV41Utils.getApplications();
- return Response.ok(applicationDefinitions).build();
+ ApplicationDefinition[] applicationDefinitionsArray = applicationDefinitions.toArray(new ApplicationDefinition[applicationDefinitions.size()]);
+ return Response.ok(applicationDefinitionsArray).build();
}
@GET
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9dcfb19/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index fd28c8b..d24aec0 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1063,6 +1063,7 @@ public class StratosApiV41Utils {
for(ApplicationContext applicationContext : applicationContexts) {
ApplicationDefinition applicationDefinition =
PojoConverter.convertApplicationContextToApplicationDefinition(applicationContext);
+ applicationDefinitions.add(applicationDefinition);
}
return applicationDefinitions;
} catch (RemoteException e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9dcfb19/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 a4b19c7..ab4a03c 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
@@ -1065,7 +1065,7 @@ public class PojoConverter {
applicationContext.setName(applicationDefinition.getName());
applicationContext.setDescription(applicationDefinition.getDescription());
applicationContext.setAlias(applicationDefinition.getAlias());
- //applicationContext.setDeploymentPolicy(compositeAppDefinition.getDeploymentPolicy());
+ applicationContext.setStatus(applicationDefinition.getStatus());
// convert and set components
if (applicationDefinition.getComponents() != null) {
@@ -1097,10 +1097,12 @@ public class PojoConverter {
applicationDefinition.setApplicationId(applicationContext.getApplicationId());
applicationDefinition.setName(applicationContext.getName());
applicationDefinition.setDescription(applicationContext.getDescription());
+ applicationDefinition.setStatus(applicationContext.getStatus());
applicationDefinition.setAlias(applicationContext.getAlias());
// convert and set components
if (applicationContext.getComponents() != null) {
+ applicationDefinition.setComponents(new ComponentDefinition());
// top level Groups
if (applicationContext.getComponents().getGroupContexts() != null) {
applicationDefinition.getComponents().setGroups(
@@ -1200,12 +1202,16 @@ public class PojoConverter {
convertPropertiesToPropertyBeansList(org.apache.stratos.autoscaler.stub.Properties properties) {
List<org.apache.stratos.manager.composite.application.beans.PropertyBean> propertyBeanList =
new ArrayList<org.apache.stratos.manager.composite.application.beans.PropertyBean>();
- for(org.apache.stratos.autoscaler.stub.Property property : properties.getProperties()) {
- org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean =
- new org.apache.stratos.manager.composite.application.beans.PropertyBean();
- propertyBean.setName(property.getName());
- propertyBean.setValue(property.getValue());
- propertyBeanList.add(propertyBean);
+ if((properties != null) && (properties.getProperties() != null)) {
+ for (org.apache.stratos.autoscaler.stub.Property property : properties.getProperties()) {
+ if(property != null) {
+ org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean =
+ new org.apache.stratos.manager.composite.application.beans.PropertyBean();
+ propertyBean.setName(property.getName());
+ propertyBean.setValue(property.getValue());
+ propertyBeanList.add(propertyBean);
+ }
+ }
}
return propertyBeanList;
}