[incubator-servicecomb-java-chassis] 02/04: [SCB-518] ServiceCenter ip address need to config default port

[liubao]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 85e80cf17f08dd926e01db25d0137aeec363f9b6
Author: weichao666 <weicha...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800

    [SCB-518] ServiceCenter ip address need to config default port
---
 .../serviceregistry/config/ServiceRegistryConfig.java            | 2 +-
 .../serviceregistry/config/TestServiceRegistryConfig.java        | 9 ++++++++-
 service-registry/src/test/resources/microservice.yaml            | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
 
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index d125037..eb28ed7 100644
--- 
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ 
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -131,7 +131,7 @@ public final class ServiceRegistryConfig {
     uriList.forEach(anUriList -> {
       try {
         URI uri = new URI(anUriList);
-        this.ssl = uri.getScheme().startsWith("https");
+        this.ssl = "https".equals(uri.getScheme());
         ipPortList.add(NetUtils.parseIpPort(uri.getScheme(), 
uri.getAuthority()));
       } catch (Exception e) {
         LOGGER.error("cse.service.registry.address invalid : {}", anUriList, 
e);
diff --git 
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
 
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index 4cfa595..f94dd78 100644
--- 
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ 
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -17,7 +17,11 @@
 
 package org.apache.servicecomb.serviceregistry.config;
 
+import java.util.List;
+
 import org.apache.commons.configuration.Configuration;
+import org.apache.servicecomb.config.ConfigUtil;
+import org.apache.servicecomb.foundation.common.net.IpPort;
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -30,6 +34,7 @@ public class TestServiceRegistryConfig {
   @BeforeClass
   public static void initClass() {
     ArchaiusUtils.resetConfig();
+    ConfigUtil.installDynamicConfig();
   }
 
   @AfterClass
@@ -45,7 +50,6 @@ public class TestServiceRegistryConfig {
     Assert.assertNotEquals(null, oConfig.getHeartbeatInterval());
     Assert.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
     Assert.assertEquals("rest", oConfig.getTransport());
-    Assert.assertNotEquals(null, oConfig.getIpPort());
     Assert.assertEquals(1, oConfig.getWorkerPoolSize());
     Assert.assertEquals(true, oConfig.isSsl());
     Assert.assertEquals(30000, oConfig.getRequestTimeout());
@@ -57,6 +61,9 @@ public class TestServiceRegistryConfig {
     Assert.assertEquals(ServiceRegistryConfig.NO_TENANT, 
oConfig.getTenantName());
     Assert.assertEquals(null, oConfig.getSecretKey());
     
Assert.assertNull(ServiceRegistryConfig.INSTANCE.getMicroserviceVersionFactory());
+    List<IpPort> ipPorts = oConfig.getIpPort();
+    Assert.assertEquals("127.0.0.1:80", ipPorts.get(0).toString());
+    Assert.assertEquals("127.0.0.1:443", ipPorts.get(1).toString());
   }
 
   @Test
diff --git a/service-registry/src/test/resources/microservice.yaml 
b/service-registry/src/test/resources/microservice.yaml
index 4788355..0c9eb39 100644
--- a/service-registry/src/test/resources/microservice.yaml
+++ b/service-registry/src/test/resources/microservice.yaml
@@ -37,7 +37,7 @@ instance_description:
 servicecomb:
   service:
     registry:
-      address: http://127.0.0.1:30100
+      address: http://127.0.0.1, https://127.0.0.1
       client:
         httpVersion: HTTP_1_1
         workerPoolSize: 1

-- 
To stop receiving notification emails like this one, please contact
liu...@apache.org.