重构类结构

discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
+import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.entity.InstanceEntity;
 import com.nepxion.discovery.console.remote.ConfigAdapter;
 import com.nepxion.discovery.console.rest.ConfigClearRestInvoker;
@@ -138,11 +139,11 @@ public class ConsoleEndpoint {
         List<ServiceInstance> serviceInstances = getInstances(service);
         List<InstanceEntity> instanceEntityList = new ArrayList<InstanceEntity>(serviceInstances.size());
         for (ServiceInstance serviceInstance : serviceInstances) {
+            Map<String, String> metadata = serviceInstance.getMetadata();
             String serviceId = serviceInstance.getServiceId().toLowerCase();
-            String version = serviceInstance.getMetadata().get("version");
+            String version = metadata.get(DiscoveryConstant.VERSION);
             String host = serviceInstance.getHost();
             int port = serviceInstance.getPort();
-            Map<String, String> metadata = serviceInstance.getMetadata();
 
             InstanceEntity instanceEntity = new InstanceEntity();
             instanceEntity.setServiceId(serviceId);

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

@@ -123,8 +123,9 @@ public class RouterEndpoint {
 
         List<RouterEntity> routerEntityList = new ArrayList<RouterEntity>();
         for (ServiceInstance instance : instanceList) {
+            Map<String, String> metadata = instance.getMetadata();
             String serviceId = instance.getServiceId().toLowerCase();
-            String version = instance.getMetadata().get(DiscoveryConstant.VERSION);
+            String version = metadata.get(DiscoveryConstant.VERSION);
             String host = instance.getHost();
             int port = instance.getPort();
 
@@ -157,8 +158,9 @@ public class RouterEndpoint {
 
         List<RouterEntity> routerEntityList = new ArrayList<RouterEntity>();
         for (Map<String, ?> instance : instanceList) {
+            Map<String, String> metadata = (Map<String, String>) instance.get(DiscoveryConstant.METADATA);
             String serviceId = instance.get(DiscoveryConstant.SERVICE_ID).toString().toLowerCase();
-            String version = ((Map<String, String>) instance.get(DiscoveryConstant.METADATA)).get(DiscoveryConstant.VERSION);
+            String version = metadata.get(DiscoveryConstant.VERSION);
             String host = instance.get(DiscoveryConstant.HOST).toString();
             Integer port = (Integer) instance.get(DiscoveryConstant.PORT);