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 2015/05/07 13:59:55 UTC
[1/2] stratos git commit: Removing duplicated PropertyBean classes in
common module
Repository: stratos
Updated Branches:
refs/heads/master f6cd86dee -> c2894de5e
Removing duplicated PropertyBean classes in common module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fd6edcc1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fd6edcc1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fd6edcc1
Branch: refs/heads/master
Commit: fd6edcc179c6baf78d0f080a27625b82ac3a1872
Parents: f6cd86d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 7 17:18:10 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 7 17:20:20 2015 +0530
----------------------------------------------------------------------
.../stratos/common/beans/PropertiesBean.java | 48 +++++++++++++++
.../common/beans/cartridge/CartridgeBean.java | 2 +
.../beans/cartridge/IaasProviderBean.java | 2 +
.../common/beans/cartridge/PropertyBean.java | 45 --------------
.../beans/kubernetes/KubernetesClusterBean.java | 2 +-
.../beans/kubernetes/KubernetesHostBean.java | 2 +-
.../beans/kubernetes/KubernetesMasterBean.java | 2 +-
.../common/beans/kubernetes/PropertiesBean.java | 48 ---------------
.../common/beans/kubernetes/PropertyBean.java | 65 --------------------
.../beans/partition/NetworkPartitionBean.java | 2 +-
.../common/beans/partition/PartitionBean.java | 2 +-
.../common/beans/topology/ClusterBean.java | 2 +-
.../common/beans/topology/MemberBean.java | 2 +-
13 files changed, 59 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertiesBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertiesBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertiesBean.java
new file mode 100644
index 0000000..42eb600
--- /dev/null
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/PropertiesBean.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.common.beans;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Had to wrap {@link PropertyBean} array using a class, since there's a bug in current
+ * stub generation.
+ */
+@XmlRootElement
+public class PropertiesBean implements Serializable {
+
+ private static final long serialVersionUID = 1986895299288322592L;
+ private List<PropertyBean> properties;
+
+ public List<PropertyBean> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(List<PropertyBean> properties) {
+ this.properties = properties;
+ }
+
+ @Override
+ public String toString() {
+ return "Properties [properties=" + properties + "]";
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/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 5cfaa32..9ce366e 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
@@ -19,6 +19,8 @@
package org.apache.stratos.common.beans.cartridge;
+import org.apache.stratos.common.beans.PropertyBean;
+
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
index 7be7f9a..5464da7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/IaasProviderBean.java
@@ -19,6 +19,8 @@
package org.apache.stratos.common.beans.cartridge;
+import org.apache.stratos.common.beans.PropertyBean;
+
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PropertyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PropertyBean.java
deleted file mode 100644
index cf104c8..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PropertyBean.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.common.beans.cartridge;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "property")
-public class PropertyBean {
-
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesClusterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesClusterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesClusterBean.java
index 80f832c..ccab17c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesClusterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesClusterBean.java
@@ -19,7 +19,7 @@
package org.apache.stratos.common.beans.kubernetes;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHostBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHostBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHostBean.java
index d60fcf6..8f2c66a 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHostBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesHostBean.java
@@ -21,7 +21,7 @@
package org.apache.stratos.common.beans.kubernetes;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
index 5eb415f..a26affb 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
@@ -21,7 +21,7 @@
package org.apache.stratos.common.beans.kubernetes;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
deleted file mode 100644
index d8ebfcd..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertiesBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.common.beans.kubernetes;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Had to wrap {@link PropertyBean} array using a class, since there's a bug in current
- * stub generation.
- */
-@XmlRootElement
-public class PropertiesBean implements Serializable {
-
- private static final long serialVersionUID = 1986895299288322592L;
- private List<PropertyBean> properties;
-
- public List<PropertyBean> getProperties() {
- return properties;
- }
-
- public void setProperties(List<PropertyBean> properties) {
- this.properties = properties;
- }
-
- @Override
- public String toString() {
- return "Properties [properties=" + properties + "]";
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
deleted file mode 100644
index 1b41f78..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/PropertyBean.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.common.beans.kubernetes;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-
-/**
- * Holds a property
- */
-@XmlRootElement
-public class PropertyBean implements Serializable {
-
- private static final long serialVersionUID = -2191782657999410197L;
-
- private String name;
- private String value;
-
- public PropertyBean() {
-
- }
-
- public PropertyBean(String name, String value) {
- this.setName(name);
- this.setValue(value);
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "Property [name=" + name + ", value=" + value + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
index fc299e2..f96f3a4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
@@ -19,7 +19,7 @@
package org.apache.stratos.common.beans.partition;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
index 1354f1c..0ab32b7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
@@ -19,7 +19,7 @@
package org.apache.stratos.common.beans.partition;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
index a781359..e275774 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.stratos.common.beans.topology;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fd6edcc1/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
index 4fd408a..53e4d6e 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java
@@ -19,7 +19,7 @@
package org.apache.stratos.common.beans.topology;
import org.apache.stratos.common.beans.cartridge.PortMappingBean;
-import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
[2/2] stratos git commit: Fixing rebase conflicts of last commit
Posted by im...@apache.org.
Fixing rebase conflicts of last commit
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c2894de5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c2894de5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c2894de5
Branch: refs/heads/master
Commit: c2894de5e37edb523da48d810d9dad4308a64781
Parents: fd6edcc
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 7 17:25:16 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 7 17:25:16 2015 +0530
----------------------------------------------------------------------
.../util/converter/ObjectConverter.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c2894de5/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 01f7c18..4950e43 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
@@ -201,7 +201,7 @@ public class ObjectConverter {
}
private static org.apache.stratos.cloud.controller.stub.Properties convertPropertyBeansToCCStubProperties(
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans) {
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeans) {
if (propertyBeans == null) {
return null;
@@ -210,7 +210,7 @@ public class ObjectConverter {
List<org.apache.stratos.cloud.controller.stub.Property> stubPropertiesList =
new ArrayList<org.apache.stratos.cloud.controller.stub.Property>();
- for (org.apache.stratos.common.beans.cartridge.PropertyBean propertyBean : propertyBeans) {
+ for (org.apache.stratos.common.beans.PropertyBean propertyBean : propertyBeans) {
org.apache.stratos.cloud.controller.stub.Property stubProperty
= new org.apache.stratos.cloud.controller.stub.Property();
stubProperty.setName(propertyBean.getName());
@@ -361,8 +361,8 @@ public class ObjectConverter {
}
if (stubNetworkPartition.getProperties() != null) {
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeanList
- = new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>();
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
+ = new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
if (stubNetworkPartition.getProperties() != null) {
if (stubNetworkPartition.getProperties().getProperties() != null) {
for (org.apache.stratos.cloud.controller.stub.Property stubProperty :
@@ -461,8 +461,8 @@ public class ObjectConverter {
partition.setDescription(stubPartition.getDescription());
partition.setKubernetesClusterId(stubPartition.getKubernetesClusterId());
if (stubPartition.getProperties() != null) {
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeanList
- = new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>();
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
+ = new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
if (stubPartition.getProperties().getProperties() != null) {
for (org.apache.stratos.cloud.controller.stub.Property stubProperty :
stubPartition.getProperties().getProperties()) {
@@ -703,7 +703,7 @@ public class ObjectConverter {
partitionBeans.setPartitionMax(partition.getPartitionMax());
//properties
if (partition.getProperties() != null) {
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeans
= convertCCStubPropertiesToPropertyBeans(partition.getProperties());
partitionBeans.setProperty(propertyBeans);
}
@@ -711,19 +711,19 @@ public class ObjectConverter {
return partitionBeans;
}
- private static List<org.apache.stratos.common.beans.cartridge.PropertyBean> convertJavaUtilPropertiesToPropertyBeans(
+ private static List<org.apache.stratos.common.beans.PropertyBean> convertJavaUtilPropertiesToPropertyBeans(
java.util.Properties properties) {
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeans = null;
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeans = null;
if (properties != null && !properties.isEmpty()) {
Enumeration<?> e = properties.propertyNames();
- propertyBeans = new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>();
+ propertyBeans = new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
while (e.hasMoreElements()) {
String key = (String) e.nextElement();
String value = properties.getProperty(key);
- org.apache.stratos.common.beans.cartridge.PropertyBean propertyBean
- = new org.apache.stratos.common.beans.cartridge.PropertyBean();
+ org.apache.stratos.common.beans.PropertyBean propertyBean
+ = new org.apache.stratos.common.beans.PropertyBean();
propertyBean.setName(key);
propertyBean.setValue(value);
propertyBeans.add(propertyBean);
@@ -962,26 +962,26 @@ public class ObjectConverter {
return kubernetesHostBean;
}
- private static List<org.apache.stratos.common.beans.cartridge.PropertyBean> convertCCStubPropertiesToPropertyBeans(
+ private static List<org.apache.stratos.common.beans.PropertyBean> convertCCStubPropertiesToPropertyBeans(
org.apache.stratos.cloud.controller.stub.Properties properties) {
if (properties == null || properties.getProperties() == null) {
return null;
}
- List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeanList
- = new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>();
+ List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
+ = new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
for (int i = 0; i < properties.getProperties().length; i++) {
propertyBeanList.add(convertStubPropertyToPropertyBean(properties.getProperties()[i]));
}
return propertyBeanList;
}
- private static org.apache.stratos.common.beans.cartridge.PropertyBean convertStubPropertyToPropertyBean(
+ private static org.apache.stratos.common.beans.PropertyBean convertStubPropertyToPropertyBean(
org.apache.stratos.cloud.controller.stub.Property propertyE) {
if (propertyE == null) {
return null;
}
- org.apache.stratos.common.beans.cartridge.PropertyBean propertyBean
- = new org.apache.stratos.common.beans.cartridge.PropertyBean();
+ org.apache.stratos.common.beans.PropertyBean propertyBean
+ = new org.apache.stratos.common.beans.PropertyBean();
propertyBean.setName(propertyE.getName());
propertyBean.setValue(propertyE.getValue());
return propertyBean;