重构类结构

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

@@ -26,7 +26,7 @@ import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
 import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
-import com.nepxion.discovery.plugin.framework.entity.PluginEntity;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterFilterType;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
@@ -35,7 +35,7 @@ public class ConfigParser extends Dom4JParser {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);
 
     @Autowired
-    private PluginEntity pluginEntity;
+    private RuleEntity ruleEntity;
 
     @Autowired
     private ReentrantReadWriteLock reentrantReadWriteLock;
@@ -75,13 +75,13 @@ public class ConfigParser extends Dom4JParser {
         try {
             reentrantReadWriteLock.writeLock().lock();
 
-            pluginEntity.setRegisterEntity(registerEntity);
-            pluginEntity.setDiscoveryEntity(discoveryEntity);
+            ruleEntity.setRegisterEntity(registerEntity);
+            ruleEntity.setDiscoveryEntity(discoveryEntity);
         } finally {
             reentrantReadWriteLock.writeLock().unlock();
         }
 
-        LOG.info("Plugin entity is {}", pluginEntity);
+        LOG.info("Rule entity is {}", ruleEntity);
     }
 
     @SuppressWarnings("rawtypes")

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

@@ -15,15 +15,15 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.framework.cache.PluginCache;
-import com.nepxion.discovery.plugin.framework.entity.PluginEntity;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.strategy.DiscoveryStrategy;
 import com.nepxion.discovery.plugin.framework.strategy.RegisterStrategy;
 
 @Configuration
 public class PluginAutoConfiguration {
     @Bean
-    public PluginEntity pluginEntity() {
-        return new PluginEntity();
+    public RuleEntity ruleEntity() {
+        return new RuleEntity();
     }
 
     @Bean

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/PluginEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/RuleEntity.java

@@ -16,7 +16,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class PluginEntity implements Serializable {
+public class RuleEntity implements Serializable {
     private static final long serialVersionUID = 7079024435084528751L;
 
     private RegisterEntity registerEntity;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/strategy/DiscoveryStrategy.java

@@ -26,11 +26,11 @@ import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 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.PluginEntity;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 
 public class DiscoveryStrategy {
     @Autowired
-    private PluginEntity pluginEntity;
+    private RuleEntity pluginEntity;
 
     @Autowired
     private PluginCache pluginCache;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/strategy/RegisterStrategy.java

@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
-import com.nepxion.discovery.plugin.framework.entity.PluginEntity;
+import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterFilterType;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
@@ -27,7 +27,7 @@ public class RegisterStrategy {
     private static final Logger LOG = LoggerFactory.getLogger(RegisterStrategy.class);
 
     @Autowired
-    private PluginEntity pluginEntity;
+    private RuleEntity ruleEntity;
 
     @Autowired
     private ReentrantReadWriteLock reentrantReadWriteLock;
@@ -43,7 +43,7 @@ public class RegisterStrategy {
     }
 
     private void applyIpAddressFilter(String serviceId, String ipAddress) {
-        RegisterEntity registerEntity = pluginEntity.getRegisterEntity();
+        RegisterEntity registerEntity = ruleEntity.getRegisterEntity();
         if (registerEntity == null) {
             return;
         }