优化类

discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ConsulAutoConfiguration.java

@@ -17,7 +17,7 @@ import com.nepxion.discovery.plugin.framework.adapter.ConsulAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 
 @Configuration
-@RibbonClients(defaultConfiguration = ConsulLoadBalanceConfiguration.class)
+@RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, ConsulLoadBalanceConfiguration.class })
 public class ConsulAutoConfiguration {
     static {
         System.out.println("");

discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ConsulLoadBalanceConfiguration.java

@@ -10,11 +10,9 @@ package com.nepxion.discovery.plugin.framework.configuration;
  */
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
 import org.springframework.cloud.consul.discovery.ConsulRibbonClientConfiguration;
-import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -23,24 +21,11 @@ import com.ecwid.consul.v1.ConsulClient;
 import com.nepxion.discovery.plugin.framework.decorator.ConsulServerListDecorator;
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
 import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.IRule;
-import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
-import com.netflix.loadbalancer.ServerListFilter;
-import com.netflix.loadbalancer.ServerListUpdater;
-import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
 
 @Configuration
 @AutoConfigureAfter(ConsulRibbonClientConfiguration.class)
 public class ConsulLoadBalanceConfiguration {
-    @Value("${ribbon.client.name}")
-    private String serviceId = "client";
-
-    @Autowired
-    private PropertiesFactory propertiesFactory;
-
     @Autowired
     private ConsulClient client;
 
@@ -59,16 +44,4 @@ public class ConsulLoadBalanceConfiguration {
 
         return serverList;
     }
-
-    @Bean
-    public ILoadBalancer ribbonLoadBalancer(IClientConfig config, ServerList<Server> serverList, ServerListFilter<Server> serverListFilter, IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
-        if (this.propertiesFactory.isSet(ILoadBalancer.class, serviceId)) {
-            return this.propertiesFactory.get(ILoadBalancer.class, config, serviceId);
-        }
-
-        ZoneAwareLoadBalancer<?> loadBalancer = new ZoneAwareLoadBalancer<>(config, rule, ping, serverList, serverListFilter, serverListUpdater);
-        loadBalanceListenerExecutor.setLoadBalancer(loadBalancer);
-
-        return loadBalancer;
-    }
 }
\ No newline at end of file

discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/configuration/EurekaAutoConfiguration.java

@@ -17,7 +17,7 @@ import com.nepxion.discovery.plugin.framework.adapter.EurekaAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 
 @Configuration
-@RibbonClients(defaultConfiguration = EurekaLoadBalanceConfiguration.class)
+@RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, EurekaLoadBalanceConfiguration.class })
 public class EurekaAutoConfiguration {
     static {
         System.out.println("");

discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/configuration/EurekaLoadBalanceConfiguration.java

@@ -24,14 +24,7 @@ import com.nepxion.discovery.plugin.framework.decorator.EurekaServerListDecorato
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.discovery.EurekaClient;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.IRule;
-import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
-import com.netflix.loadbalancer.ServerListFilter;
-import com.netflix.loadbalancer.ServerListUpdater;
-import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
 import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
 
 @Configuration
@@ -67,16 +60,4 @@ public class EurekaLoadBalanceConfiguration {
 
         return serverList;
     }
-
-    @Bean
-    public ILoadBalancer ribbonLoadBalancer(IClientConfig config, ServerList<Server> serverList, ServerListFilter<Server> serverListFilter, IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
-        if (this.propertiesFactory.isSet(ILoadBalancer.class, serviceId)) {
-            return this.propertiesFactory.get(ILoadBalancer.class, config, serviceId);
-        }
-
-        ZoneAwareLoadBalancer<?> loadBalancer = new ZoneAwareLoadBalancer<>(config, rule, ping, serverList, serverListFilter, serverListUpdater);
-        loadBalanceListenerExecutor.setLoadBalancer(loadBalancer);
-
-        return loadBalancer;
-    }
 }
\ No newline at end of file

discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ZookeeperAutoConfiguration.java

@@ -17,7 +17,7 @@ import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.ZookeeperAdapter;
 
 @Configuration
-@RibbonClients(defaultConfiguration = ZookeeperLoadBalanceConfiguration.class)
+@RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, ZookeeperLoadBalanceConfiguration.class })
 public class ZookeeperAutoConfiguration {
     static {
         System.out.println("");

discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ZookeeperLoadBalanceConfiguration.java

@@ -10,9 +10,7 @@ package com.nepxion.discovery.plugin.framework.configuration;
  */
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
 import org.springframework.cloud.zookeeper.discovery.ZookeeperRibbonClientConfiguration;
 import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistry;
 import org.springframework.context.annotation.Bean;
@@ -22,24 +20,11 @@ import org.springframework.core.env.ConfigurableEnvironment;
 import com.nepxion.discovery.plugin.framework.decorator.ZookeeperServerListDecorator;
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
 import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.IRule;
-import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
-import com.netflix.loadbalancer.ServerListFilter;
-import com.netflix.loadbalancer.ServerListUpdater;
-import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
 
 @Configuration
 @AutoConfigureAfter(ZookeeperRibbonClientConfiguration.class)
 public class ZookeeperLoadBalanceConfiguration {
-    @Value("${ribbon.client.name}")
-    private String serviceId = "client";
-
-    @Autowired
-    private PropertiesFactory propertiesFactory;
-
     @Autowired
     private ZookeeperServiceRegistry registry;
 
@@ -60,16 +45,4 @@ public class ZookeeperLoadBalanceConfiguration {
 
         return serverList;
     }
-
-    @Bean
-    public ILoadBalancer ribbonLoadBalancer(IClientConfig config, ServerList<Server> serverList, ServerListFilter<Server> serverListFilter, IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
-        if (this.propertiesFactory.isSet(ILoadBalancer.class, serviceId)) {
-            return this.propertiesFactory.get(ILoadBalancer.class, config, serviceId);
-        }
-
-        ZoneAwareLoadBalancer<?> loadBalancer = new ZoneAwareLoadBalancer<>(config, rule, ping, serverList, serverListFilter, serverListUpdater);
-        loadBalanceListenerExecutor.setLoadBalancer(loadBalancer);
-
-        return loadBalancer;
-    }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginLoadBalanceConfiguration.java

+package com.nepxion.discovery.plugin.framework.configuration;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IPing;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import com.netflix.loadbalancer.ServerListFilter;
+import com.netflix.loadbalancer.ServerListUpdater;
+import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
+
+@Configuration
+@AutoConfigureAfter(RibbonClientConfiguration.class)
+public class PluginLoadBalanceConfiguration {
+    @Value("${ribbon.client.name}")
+    private String serviceId = "client";
+
+    @Autowired
+    private PropertiesFactory propertiesFactory;
+
+    @Autowired
+    private LoadBalanceListenerExecutor loadBalanceListenerExecutor;
+
+    @Bean
+    public ILoadBalancer ribbonLoadBalancer(IClientConfig config, ServerList<Server> serverList, ServerListFilter<Server> serverListFilter, IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
+        if (this.propertiesFactory.isSet(ILoadBalancer.class, serviceId)) {
+            return this.propertiesFactory.get(ILoadBalancer.class, config, serviceId);
+        }
+
+        ZoneAwareLoadBalancer<?> loadBalancer = new ZoneAwareLoadBalancer<>(config, rule, ping, serverList, serverListFilter, serverListUpdater);
+        loadBalanceListenerExecutor.setLoadBalancer(loadBalancer);
+
+        return loadBalancer;
+    }
+}
\ No newline at end of file