优化类结构

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

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.nepxion.discovery.plugin.framework.cache.RuleCache;
+import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
@@ -40,10 +40,10 @@ public class ConfigEndpoint {
     private PluginContextAware pluginContextAware;
 
     @Autowired
-    private PluginEventWapper pluginEventWapper;
+    private PluginAdapter pluginAdapter;
 
     @Autowired
-    private RuleCache ruleCache;
+    private PluginEventWapper pluginEventWapper;
 
     @RequestMapping(path = "/config/update-async", method = RequestMethod.POST)
     @ApiOperation(value = "异步推送更新规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@@ -60,7 +60,7 @@ public class ConfigEndpoint {
     @RequestMapping(path = "/config/view", method = RequestMethod.GET)
     @ApiOperation(value = "查看当前生效的规则配置信息", notes = "", response = ResponseEntity.class, httpMethod = "GET")
     public ResponseEntity<?> view() {
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("No config to view");
         }

discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigParser.java

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
 import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
-import com.nepxion.discovery.plugin.framework.cache.RuleCache;
+import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.CountFilterEntity;
@@ -44,7 +44,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);
 
     @Autowired
-    private RuleCache ruleCache;
+    private PluginAdapter pluginAdapter;
 
     @Override
     public void parse(InputStream inputStream) {
@@ -102,7 +102,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
         ruleEntity.setDiscoveryEntity(discoveryEntity);
         ruleEntity.setContent(text);
 
-        ruleCache.put(PluginConstant.RULE, ruleEntity);
+        pluginAdapter.setRule(ruleEntity);
 
         LOG.info("Rule entity=\n{}", ruleEntity);
     }

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

@@ -13,8 +13,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.framework.cache.PluginCache;
+import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 
 public abstract class AbstractPluginAdapter implements PluginAdapter {
     @Autowired
@@ -23,6 +25,9 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
     @Autowired
     protected PluginCache pluginCache;
 
+    @Autowired
+    protected RuleCache ruleCache;
+
     @Override
     public String getServiceId() {
         return pluginContextAware.getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_NAME);
@@ -52,4 +57,14 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
     public void clearDynamicVersion() {
         pluginCache.clear(PluginConstant.VERSION);
     }
+
+    @Override
+    public RuleEntity getRule() {
+        return ruleCache.get(PluginConstant.RULE);
+    }
+
+    @Override
+    public void setRule(RuleEntity ruleEntity) {
+        ruleCache.put(PluginConstant.RULE, ruleEntity);
+    }
 }
\ No newline at end of file

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

@@ -13,6 +13,7 @@ import java.util.Map;
 
 import org.springframework.cloud.client.serviceregistry.Registration;
 
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.netflix.loadbalancer.Server;
 
 public interface PluginAdapter {
@@ -35,4 +36,8 @@ public interface PluginAdapter {
     void setDynamicVersion(String version);
 
     void clearDynamicVersion();
+
+    RuleEntity getRule();
+
+    void setRule(RuleEntity ruleEntity);
 }
\ No newline at end of file

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

@@ -12,15 +12,11 @@ package com.nepxion.discovery.plugin.framework.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
-import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.discovery.plugin.framework.event.PluginEventWapper;
 
 public class BasicListener implements Listener {
     @Autowired
-    protected RuleCache ruleCache;
-
-    @Autowired
     protected PluginContextAware pluginContextAware;
 
     @Autowired

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

@@ -17,7 +17,6 @@ import java.util.Map;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cloud.client.ServiceInstance;
 
-import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
 import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
@@ -30,7 +29,7 @@ public class HostFilterDiscoveryListener extends AbstractDiscoveryListener {
     }
 
     private void applyHostFilter(String providerServiceId, List<ServiceInstance> instances) {
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }

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

@@ -40,7 +40,7 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
             return;
         }
 
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }

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

@@ -16,7 +16,6 @@ import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
 
-import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
 import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
@@ -30,7 +29,7 @@ public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     }
 
     private void applyHostFilter(String providerServiceId, List<? extends Server> servers) {
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }

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

@@ -18,7 +18,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
@@ -40,7 +39,7 @@ public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListene
             return;
         }
 
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }

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

@@ -36,7 +36,7 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
     }
 
     private void applyCountFilter(String serviceId, String host, int port) {
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }

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

@@ -35,7 +35,7 @@ public class HostFilterRegisterListener extends AbstractRegisterListener {
     }
 
     private void applyHostFilter(String serviceId, String host, int port) {
-        RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
+        RuleEntity ruleEntity = pluginAdapter.getRule();
         if (ruleEntity == null) {
             return;
         }