You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/01/24 19:24:50 UTC
stratos git commit: Refactor accessUrls to list
Repository: stratos
Updated Branches:
refs/heads/master 11b9d636b -> 11ee9e2b1
Refactor accessUrls to list<String>
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11ee9e2b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11ee9e2b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11ee9e2b
Branch: refs/heads/master
Commit: 11ee9e2b1a184ac5f24be12b2c61bdacf3cb123c
Parents: 11b9d63
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Sat Jan 24 23:23:26 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sat Jan 24 23:54:35 2015 +0530
----------------------------------------------------------------------
.../controller/services/impl/CloudControllerServiceImpl.java | 4 ++--
.../org/apache/stratos/messaging/domain/topology/Cluster.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11ee9e2b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 4d63db3..b537039 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -990,7 +990,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// Create a Cluster Context obj. for each of the Clusters in the Application
List<Cluster> clusters = new ArrayList<Cluster>();
- Map<String,List> accessUrls= new HashMap<String, List>();
+ Map<String,List<String>> accessUrls= new HashMap<String, List<String>>();
for (ApplicationClusterContext appClusterCtxt : appClustersContexts) {
if(appClusterCtxt.getCartridgeType().equals("lb")) {
@@ -999,7 +999,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
for (int i = 0; i < dependencyClusterIDs.length; i++) {
Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(
appClusterCtxt.getCartridgeType());
- List accessUrlPerCluster = new ArrayList();
+ List<String> accessUrlPerCluster = new ArrayList();
List<PortMapping> portMappings = cartridge.getPortMappings();
for (PortMapping portMap : portMappings) {
if (portMap.isKubernetesServicePortMapping()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/11ee9e2b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
index 23c9782..bfcb552 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
@@ -62,7 +62,7 @@ public class Cluster implements Serializable {
private Properties properties;
private Map<String, ClusterInstance> instanceIdToInstanceContextMap;
//private LifeCycleStateManager<ClusterStatus> clusterStateManager;
- private List accessUrls;
+ private List<String> accessUrls;
public Cluster(Cluster cluster) {
this.serviceName = cluster.getServiceName();
@@ -339,11 +339,11 @@ public class Cluster implements Serializable {
return this.instanceIdToInstanceContextMap.values();
}
- public List getAccessUrls() {
+ public List<String> getAccessUrls() {
return accessUrls;
}
- public void setAccessUrls(List accessUrls) {
+ public void setAccessUrls(List<String> accessUrls) {
this.accessUrls = accessUrls;
}
// public ClusterStatus getTempStatus() {