[#1519] ServiceCombRegistration add host/port etc. api implement. (#1522) (#1525)

Author: chengyouling

integration-tests/discovery-servicecomb-tests/order-consumer/src/main/java/com/huaweicloud/sample/ServiceCombRegistrationController.java

@@ -16,10 +16,14 @@
  */
 package com.huaweicloud.sample;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.servicecomb.service.center.client.model.Microservice;
 import org.apache.servicecomb.service.center.client.model.MicroserviceInstance;
 import org.apache.servicecomb.service.center.client.model.MicroserviceInstanceStatus;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -31,6 +35,9 @@
 public class ServiceCombRegistrationController {
   private final ServiceCombRegistration serviceCombRegistration;
 
+  @Value("${server.port:8080}")
+  private String port;
+
   @Autowired
   public ServiceCombRegistrationController(
       ServiceCombRegistration serviceCombRegistration) {
@@ -50,6 +57,15 @@ public boolean testMicroserviceInfoCorrect() {
     assertTrue(microserviceInstance.getProperties().get("x-test").equals("value"));
     assertTrue(microserviceInstance.getProperties().get("x-test2").equals("value2"));
     assertTrue(microserviceInstance.getStatus() == MicroserviceInstanceStatus.UP);
+
+    Map<String, String> metaData = serviceCombRegistration.getMetadata();
+    assertTrue(metaData.size() == 3);
+    assertTrue(!serviceCombRegistration.isSecure());
+    assertTrue(Integer.parseInt(port) == serviceCombRegistration.getPort());
+    List<String> endpoints = serviceCombRegistration.getMicroserviceInstance().getEndpoints();
+    assertTrue(endpoints.get(0).contains(serviceCombRegistration.getHost()));
+    String host = serviceCombRegistration.getHost();
+    assertTrue(host.equals(serviceCombRegistration.getUri().getHost()));
     return true;
   }
 

spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/MicroserviceHandler.java

@@ -63,6 +63,8 @@ public class MicroserviceHandler {
 
   private static final String INSTANCE_PROPS = "SERVICECOMB_INSTANCE_PROPS";
 
+  private static String instanceAddress;
+
   public static Microservice createMicroservice(BootstrapProperties bootstrapProperties) {
     DiscoveryBootstrapProperties discoveryBootstrapProperties = bootstrapProperties.getDiscoveryBootstrapProperties();
     MicroserviceProperties microserviceProperties = bootstrapProperties.getMicroserviceProperties();
@@ -138,6 +140,7 @@ public static MicroserviceInstance createMicroserviceInstance(
     } else {
       address = discoveryBootstrapProperties.getPublishAddress();
     }
+    instanceAddress = address;
     if (discoveryProperties.isSslEnabled()) {
       endPoints.add("rest://" + address + ":" + discoveryProperties.getPort() + "?sslEnabled="
           + discoveryProperties.isSslEnabled());
@@ -206,4 +209,8 @@ private static Map<String, String> parseProps(String... value) {
         .filter(v -> v.length == 2)
         .collect(Collectors.toMap(v -> v[0], v -> v[1]));
   }
+
+  public static String getInstanceAddress() {
+    return instanceAddress;
+  }
 }

spring-cloud-huawei-service-engine/service-engine-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/registry/ServiceCombRegistration.java

@@ -20,8 +20,10 @@
 import java.net.URI;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.service.center.client.model.Microservice;
 import org.apache.servicecomb.service.center.client.model.MicroserviceInstance;
+import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
 
 import com.huaweicloud.service.engine.common.configration.bootstrap.BootstrapProperties;
@@ -43,9 +45,12 @@ public class ServiceCombRegistration implements Registration {
 
   private final DiscoveryBootstrapProperties discoveryBootstrapProperties;
 
+  private final DiscoveryProperties discoveryProperties;
+
   public ServiceCombRegistration(BootstrapProperties bootstrapProperties,
       DiscoveryProperties discoveryProperties) {
     this.discoveryBootstrapProperties = bootstrapProperties.getDiscoveryBootstrapProperties();
+    this.discoveryProperties = discoveryProperties;
     this.microservice = MicroserviceHandler.createMicroservice(bootstrapProperties);
     this.microserviceInstance = MicroserviceHandler
         .createMicroserviceInstance(bootstrapProperties, discoveryProperties);
@@ -76,26 +81,26 @@ public String getInstanceId() {
 
   @Override
   public String getHost() {
-    throw new IllegalStateException("not supported");
+    return MicroserviceHandler.getInstanceAddress();
   }
 
   @Override
   public int getPort() {
-    throw new IllegalStateException("not supported");
+    return StringUtils.isEmpty(discoveryProperties.getPort()) ? 8080 : Integer.parseInt(discoveryProperties.getPort());
   }
 
   @Override
   public boolean isSecure() {
-    throw new IllegalStateException("not supported");
+    return discoveryProperties.isSslEnabled();
   }
 
   @Override
   public URI getUri() {
-    throw new IllegalStateException("not supported");
+    return DefaultServiceInstance.getUri(this);
   }
 
   @Override
   public Map<String, String> getMetadata() {
-    throw new IllegalStateException("not supported");
+    return microserviceInstance.getProperties();
   }
 }