统一Metadata大小写

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/entity/InstanceEntity.java

@@ -30,7 +30,7 @@ public class InstanceEntity implements Serializable {
     private int port;
     private String rule;
     private String dynamicRule;
-    private Map<String, String> metaData;
+    private Map<String, String> metadata;
 
     public String getServiceId() {
         return serviceId;
@@ -88,21 +88,21 @@ public class InstanceEntity implements Serializable {
         this.dynamicRule = dynamicRule;
     }
 
-    public Map<String, String> getMetaData() {
-        return metaData;
+    public Map<String, String> getMetadata() {
+        return metadata;
     }
 
-    public void setMetaData(Map<String, String> metaData) {
-        this.metaData = metaData;
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
     }
 
     public String getFilter() {
-        String filterKey = metaData.get(ConsoleConstant.SPRING_APPLICATION_GROUP_KEY);
+        String filterKey = metadata.get(ConsoleConstant.SPRING_APPLICATION_GROUP_KEY);
         if (StringUtils.isEmpty(filterKey)) {
             return "";
         }
 
-        String filter = metaData.get(filterKey);
+        String filter = metadata.get(filterKey);
         if (filter == null) {
             return "";
         }
@@ -111,7 +111,7 @@ public class InstanceEntity implements Serializable {
     }
 
     public String getPlugin() {
-        String plugin = metaData.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN);
+        String plugin = metadata.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN);
         if (plugin == null) {
             return "";
         }
@@ -120,7 +120,7 @@ public class InstanceEntity implements Serializable {
     }
 
     public boolean isDiscoveryControlEnabled() {
-        String flag = metaData.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
+        String flag = metadata.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
         if (flag == null) {
             return true;
         }
@@ -129,7 +129,7 @@ public class InstanceEntity implements Serializable {
     }
 
     public boolean isConfigRestControlEnabled() {
-        String flag = metaData.get(ConsoleConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
+        String flag = metadata.get(ConsoleConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
         if (flag == null) {
             return true;
         }

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

@@ -141,14 +141,14 @@ public class ConsoleEndpoint {
             String version = serviceInstance.getMetadata().get("version");
             String host = serviceInstance.getHost();
             int port = serviceInstance.getPort();
-            Map<String, String> metaData = serviceInstance.getMetadata();
+            Map<String, String> metadata = serviceInstance.getMetadata();
 
             InstanceEntity instanceEntity = new InstanceEntity();
             instanceEntity.setServiceId(serviceId);
             instanceEntity.setVersion(version);
             instanceEntity.setHost(host);
             instanceEntity.setPort(port);
-            instanceEntity.setMetaData(metaData);
+            instanceEntity.setMetadata(metadata);
 
             instanceEntityList.add(instanceEntity);
         }

discovery-console/src/main/java/com/nepxion/discovery/console/entity/InstanceEntity.java

@@ -24,7 +24,7 @@ public class InstanceEntity implements Serializable {
     private String version;
     private String host;
     private int port;
-    private Map<String, String> metaData;
+    private Map<String, String> metadata;
 
     public String getServiceId() {
         return serviceId;
@@ -58,12 +58,12 @@ public class InstanceEntity implements Serializable {
         this.port = port;
     }
 
-    public Map<String, String> getMetaData() {
-        return metaData;
+    public Map<String, String> getMetadata() {
+        return metadata;
     }
 
-    public void setMetaData(Map<String, String> metaData) {
-        this.metaData = metaData;
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
     }
 
     @Override

discovery-console/src/main/java/com/nepxion/discovery/console/rest/AbstractRestInvoker.java

@@ -77,9 +77,9 @@ public abstract class AbstractRestInvoker {
     }
 
     protected void checkDiscoveryControlPermission(ServiceInstance serviceInstance) {
-        Map<String, String> metaData = serviceInstance.getMetadata();
+        Map<String, String> metadata = serviceInstance.getMetadata();
 
-        String discoveryControlEnabled = metaData.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
+        String discoveryControlEnabled = metadata.get(ConsoleConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
         if (StringUtils.isEmpty(discoveryControlEnabled)) {
             throw new IllegalArgumentException("No metadata for key=" + ConsoleConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
         }
@@ -90,9 +90,9 @@ public abstract class AbstractRestInvoker {
     }
 
     protected void checkConfigRestControlPermission(ServiceInstance serviceInstance) {
-        Map<String, String> metaData = serviceInstance.getMetadata();
+        Map<String, String> metadata = serviceInstance.getMetadata();
 
-        String configRestControlEnabled = metaData.get(ConsoleConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
+        String configRestControlEnabled = metadata.get(ConsoleConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
         if (StringUtils.isEmpty(configRestControlEnabled)) {
             throw new IllegalArgumentException("No metadata for key=" + ConsoleConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
         }

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

@@ -18,7 +18,7 @@ import com.netflix.loadbalancer.Server;
 
 public class ConsulAdapter extends AbstractPluginAdapter {
     @Override
-    public Map<String, String> getServerMetaData(Server server) {
+    public Map<String, String> getServerMetadata(Server server) {
         if (server instanceof ConsulServer) {
             ConsulServer consulServer = (ConsulServer) server;
 

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

@@ -17,7 +17,7 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
 
 public class EurekaAdapter extends AbstractPluginAdapter {
     @Override
-    public Map<String, String> getServerMetaData(Server server) {
+    public Map<String, String> getServerMetadata(Server server) {
         if (server instanceof DiscoveryEnabledServer) {
             DiscoveryEnabledServer discoveryEnabledServer = (DiscoveryEnabledServer) server;
 

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

@@ -18,14 +18,14 @@ import com.nepxion.discovery.plugin.framework.exception.PluginException;
 import com.netflix.loadbalancer.Server;
 
 public class ZookeeperAdapter extends AbstractPluginAdapter {
-    // Zookeeper比较特殊，父类中getMetaData().get(groupKey)方法不行，执行该方法的时候MetaData还没初始化
+    // Zookeeper比较特殊，父类中getMetadata().get(groupKey)方法不行，执行该方法的时候Metadata还没初始化
     @Override
     protected String getGroup(String groupKey) {
         return pluginContextAware.getEnvironment().getProperty(ZookeeperConstant.META_DATA + "." + groupKey);
     }
 
     @Override
-    public Map<String, String> getServerMetaData(Server server) {
+    public Map<String, String> getServerMetadata(Server server) {
         if (server instanceof ZookeeperServer) {
             ZookeeperServer zookeeperServer = (ZookeeperServer) server;
 

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

@@ -49,7 +49,7 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
     }
 
     protected String getGroup(String groupKey) {
-        return getMetaData().get(groupKey);
+        return getMetadata().get(groupKey);
     }
 
     @Override
@@ -68,7 +68,7 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
     }
 
     @Override
-    public Map<String, String> getMetaData() {
+    public Map<String, String> getMetadata() {
         return registration.getMetadata();
     }
 
@@ -84,7 +84,7 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
 
     @Override
     public String getLocalVersion() {
-        return getMetaData().get(PluginConstant.VERSION);
+        return getMetadata().get(PluginConstant.VERSION);
     }
 
     @Override
@@ -139,6 +139,6 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
 
     @Override
     public String getServerVersion(Server server) {
-        return getServerMetaData(server).get(PluginConstant.VERSION);
+        return getServerMetadata(server).get(PluginConstant.VERSION);
     }
 }
\ No newline at end of file

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

@@ -23,7 +23,7 @@ public interface PluginAdapter {
 
     int getPort();
 
-    Map<String, String> getMetaData();
+    Map<String, String> getMetadata();
 
     String getVersion();
 
@@ -47,7 +47,7 @@ public interface PluginAdapter {
 
     void clearDynamicRule();
 
-    Map<String, String> getServerMetaData(Server server);
+    Map<String, String> getServerMetadata(Server server);
 
     String getServerVersion(Server server);
 }
\ No newline at end of file

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

@@ -107,8 +107,8 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
                 Iterator<ServiceInstance> iterator = instances.iterator();
                 while (iterator.hasNext()) {
                     ServiceInstance serviceInstance = iterator.next();
-                    String metaDataVersion = serviceInstance.getMetadata().get(PluginConstant.VERSION);
-                    if (!allNoFilterValueList.contains(metaDataVersion)) {
+                    String metadataVersion = serviceInstance.getMetadata().get(PluginConstant.VERSION);
+                    if (!allNoFilterValueList.contains(metadataVersion)) {
                         iterator.remove();
                     }
                 }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/VersionFilterLoadBalanceListener.java

@@ -106,8 +106,8 @@ public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListene
                 Iterator<? extends Server> iterator = servers.iterator();
                 while (iterator.hasNext()) {
                     Server server = iterator.next();
-                    String metaDataVersion = pluginAdapter.getServerVersion(server);
-                    if (!allNoFilterValueList.contains(metaDataVersion)) {
+                    String metadataVersion = pluginAdapter.getServerVersion(server);
+                    if (!allNoFilterValueList.contains(metadataVersion)) {
                         iterator.remove();
                     }
                 }

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/extension/MyDiscoveryEnabledAdapter.java

@@ -31,7 +31,7 @@ public class MyDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     @Override
     public boolean apply(Server server, StrategyContext context) {
         String serviceId = server.getMetaInfo().getAppName().toLowerCase();
-        Map<String, String> metadata = pluginAdapter.getServerMetaData(server);
+        Map<String, String> metadata = pluginAdapter.getServerMetadata(server);
         Map<String, Object> attributes = context.getAttributes();
 
         LOG.info("负载均衡用户定制触发：serviceId={}, host={}, metadata={}, context={}", serviceId, server.toString(), metadata, context);