Repository: stratos Updated Branches: refs/heads/master 6aa985aa6 -> 5a8c11f55
Replacing URL with type URI to generate access URLs Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5a8c11f5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5a8c11f5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5a8c11f5 Branch: refs/heads/master Commit: 5a8c11f550508c9adf10afc392a53901c4798dd7 Parents: 6aa985a Author: lasinducharith <[email protected]> Authored: Tue Jul 28 18:26:39 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Tue Jul 28 18:26:39 2015 +0530 ---------------------------------------------------------------------- .../messaging/topology/TopologyBuilder.java | 1 + .../services/impl/CloudControllerServiceImpl.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5a8c11f5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 39638a1..7acd0f5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -883,6 +883,7 @@ public class TopologyBuilder { String[] publicIPs = kubernetesService.getPublicIPs(); if ((publicIPs != null) && (publicIPs.length > 0)) { for (String publicIP : publicIPs) { + // Using type URI since only http, https, ftp, file, jar protocols are supported in URL URI accessURL = new URI(kubernetesService.getProtocol(), null, publicIP, kubernetesService.getPort(), null, null, null); cluster.addAccessUrl(accessURL.toString()); http://git-wip-us.apache.org/repos/asf/stratos/blob/5a8c11f5/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 4d51cc1..55e70db 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 @@ -39,8 +39,8 @@ import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.topology.*; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.Callable; @@ -1063,18 +1063,18 @@ public class CloudControllerServiceImpl implements CloudControllerService { for (ClusterPortMapping clusterPortMapping : clusterPortMappings) { try { if (clusterPortMapping.isKubernetes()) { - URL accessUrl = new URL(clusterPortMapping.getProtocol(), appClusterCtxt.getHostName(), - clusterPortMapping.getKubernetesServicePort(), ""); + // Using type URI since only http, https, ftp, file, jar protocols are supported in URL + URI accessUrl = new URI(clusterPortMapping.getProtocol(), null, appClusterCtxt.getHostName(), + clusterPortMapping.getKubernetesServicePort(), null, null, null); accessUrlPerCluster.add(accessUrl.toString()); } else { - URL accessUrl = new URL(clusterPortMapping.getProtocol(), appClusterCtxt.getHostName(), - clusterPortMapping.getProxyPort(), ""); + URI accessUrl = new URI(clusterPortMapping.getProtocol(), null, appClusterCtxt.getHostName(), + clusterPortMapping.getProxyPort(), null, null, null); accessUrlPerCluster.add(accessUrl.toString()); } - } catch (MalformedURLException e) { + } catch (URISyntaxException e) { String message = "Could not generate access URL"; log.error(message, e); - throw new ApplicationClusterRegistrationException(message, e); } } accessUrls.put(dependencyClusterIDs[i], accessUrlPerCluster);
