重构类结构

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/RouterEndpoint.java

@@ -125,7 +125,7 @@ public class RouterEndpoint implements MvcEndpoint {
     public RouterEntity getRouterEntity() {
         String serviceId = pluginAdapter.getServiceId();
         String version = pluginAdapter.getVersion();
-        String host = pluginAdapter.getIpAddress(registration);
+        String host = pluginAdapter.getHost(registration);
         int port = pluginAdapter.getPort(registration);
         // String host = HostUtil.getLocalhost();
         // int port = pluginContainerInitializedHandler.getPort();

discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/adapter/ConsulAdapter.java

@@ -15,7 +15,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.consul.discovery.ConsulServer;
-import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
 
 import com.nepxion.discovery.plugin.framework.constant.ConsulConstant;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
@@ -51,25 +50,29 @@ public class ConsulAdapter extends AbstractPluginAdapter {
     }
 
     @Override
-    public String getIpAddress(Registration registration) {
-        if (registration instanceof ConsulRegistration) {
+    public String getHost(Registration registration) {
+        /*if (registration instanceof ConsulRegistration) {
             ConsulRegistration consulRegistration = (ConsulRegistration) registration;
 
             return consulRegistration.getService().getAddress();
         }
 
-        throw new PluginException("Registration instance isn't the type of ConsulRegistration");
+        throw new PluginException("Registration instance isn't the type of ConsulRegistration");*/
+
+        return registration.getHost();
     }
 
     @Override
     public int getPort(Registration registration) {
-        if (registration instanceof ConsulRegistration) {
+        /*if (registration instanceof ConsulRegistration) {
             ConsulRegistration consulRegistration = (ConsulRegistration) registration;
 
             return consulRegistration.getService().getPort();
         }
 
-        throw new PluginException("Registration instance isn't the type of ConsulRegistration");
+        throw new PluginException("Registration instance isn't the type of ConsulRegistration");*/
+
+        return registration.getPort();
     }
 
     @Override

discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EurekaAdapter.java

@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.adapter;
  */
 
 import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
 
 import com.nepxion.discovery.plugin.framework.constant.EurekaConstant;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
@@ -20,19 +19,21 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
 
 public class EurekaAdapter extends AbstractPluginAdapter {
     @Override
-    public String getIpAddress(Registration registration) {
-        if (registration instanceof EurekaRegistration) {
+    public String getHost(Registration registration) {
+        /*if (registration instanceof EurekaRegistration) {
             EurekaRegistration eurekaRegistration = (EurekaRegistration) registration;
 
             return eurekaRegistration.getInstanceConfig().getIpAddress();
         }
 
-        throw new PluginException("Registration instance isn't the type of EurekaRegistration");
+        throw new PluginException("Registration instance isn't the type of EurekaRegistration");*/
+
+        return registration.getHost();
     }
 
     @Override
     public int getPort(Registration registration) {
-        if (registration instanceof EurekaRegistration) {
+        /*if (registration instanceof EurekaRegistration) {
             EurekaRegistration eurekaRegistration = (EurekaRegistration) registration;
 
             if (eurekaRegistration.getInstanceConfig().getSecurePortEnabled()) {
@@ -42,7 +43,9 @@ public class EurekaAdapter extends AbstractPluginAdapter {
             return eurekaRegistration.getInstanceConfig().getNonSecurePort();
         }
 
-        throw new PluginException("Registration instance isn't the type of EurekaRegistration");
+        throw new PluginException("Registration instance isn't the type of EurekaRegistration");*/
+
+        return registration.getPort();
     }
 
     @Override

discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/adapter/ZookeeperAdapter.java

@@ -11,7 +11,6 @@ package com.nepxion.discovery.plugin.framework.adapter;
 
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.zookeeper.discovery.ZookeeperServer;
-import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperRegistration;
 
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.constant.ZookeeperConstant;
@@ -20,25 +19,29 @@ import com.netflix.loadbalancer.Server;
 
 public class ZookeeperAdapter extends AbstractPluginAdapter {
     @Override
-    public String getIpAddress(Registration registration) {
-        if (registration instanceof ZookeeperRegistration) {
+    public String getHost(Registration registration) {
+        /*if (registration instanceof ZookeeperRegistration) {
             ZookeeperRegistration zookeeperRegistration = (ZookeeperRegistration) registration;
 
             return zookeeperRegistration.getServiceInstance().getAddress();
         }
 
-        throw new PluginException("Registration instance isn't the type of ZookeeperRegistration");
+        throw new PluginException("Registration instance isn't the type of ZookeeperRegistration");*/
+
+        return registration.getHost();
     }
 
     @Override
     public int getPort(Registration registration) {
-        if (registration instanceof ZookeeperRegistration) {
+        /*if (registration instanceof ZookeeperRegistration) {
             ZookeeperRegistration zookeeperRegistration = (ZookeeperRegistration) registration;
 
             return zookeeperRegistration.getServiceInstance().getPort();
         }
 
-        throw new PluginException("Registration instance isn't the type of ZookeeperRegistration");
+        throw new PluginException("Registration instance isn't the type of ZookeeperRegistration");*/
+
+        return registration.getPort();
     }
 
     @Override

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/PluginAdapter.java

@@ -16,7 +16,7 @@ import com.netflix.loadbalancer.Server;
 public interface PluginAdapter {
     String getServiceId();
 
-    String getIpAddress(Registration registration);
+    String getHost(Registration registration);
 
     int getPort(Registration registration);
 

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/CountFilterRegisterListener.java

@@ -29,7 +29,7 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public void onRegister(Registration registration) {
         String serviceId = registration.getServiceId();
-        String ipAddress = pluginAdapter.getIpAddress(registration);
+        String ipAddress = pluginAdapter.getHost(registration);
         int port = pluginAdapter.getPort(registration);
 
         applyCountFilter(serviceId, ipAddress, port);

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/IpAddressFilterRegisterListener.java

@@ -28,7 +28,7 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public void onRegister(Registration registration) {
         String serviceId = registration.getServiceId();
-        String ipAddress = pluginAdapter.getIpAddress(registration);
+        String ipAddress = pluginAdapter.getHost(registration);
         int port = pluginAdapter.getPort(registration);
 
         applyIpAddressFilter(serviceId, ipAddress, port);