adding List for meta data keys
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d2f388e0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d2f388e0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d2f388e0 Branch: refs/heads/master Commit: d2f388e052242cb16eb65c2bafeeb1f10f4ede26 Parents: 8cc5960 Author: reka <[email protected]> Authored: Tue May 19 16:39:10 2015 +0530 Committer: reka <[email protected]> Committed: Tue May 19 17:29:15 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/common/beans/cartridge/CartridgeBean.java | 6 +++--- .../stratos/rest/endpoint/util/converter/ObjectConverter.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d2f388e0/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java index bb82018..482c566 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java @@ -40,7 +40,7 @@ public class CartridgeBean { private boolean multiTenant; private DeploymentBean deployment; private List<PortMappingBean> portMapping; - private String[] metadataKeys; + private List<String> metadataKeys; private List<IaasProviderBean> iaasProvider; private PersistenceBean persistence; /** @@ -219,11 +219,11 @@ public class CartridgeBean { ", Properties: " + getProperties(); } - public String[] getMetadataKeys() { + public List<String> getMetadataKeys() { return metadataKeys; } - public void setMetadataKeys(String[] metadataKeys) { + public void setMetadataKeys(List<String> metadataKeys) { this.metadataKeys = metadataKeys; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d2f388e0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 000da07..62d8c5c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -79,7 +79,8 @@ public class ObjectConverter { cartridge.setDisplayName(cartridgeBean.getDisplayName()); cartridge.setDescription(cartridgeBean.getDescription()); cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); - cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys()); + cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys(). + toArray(new String[cartridgeBean.getMetadataKeys().size()])); // deployment information if (cartridgeBean.getDeployment() != null) { @@ -1591,7 +1592,7 @@ public class ObjectConverter { cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { - cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys()); + cartridge.setMetadataKeys(Arrays.asList(cartridgeInfo.getMetadataKeys())); } //convert persistence
