重构类结构

discovery-plugin-configuration/pom.xml → discovery-plugin-config-center/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <artifactId>discovery-plugin-configuration</artifactId>
-    <name>Nepxion Discovery Plugin Configuration</name>
+    <artifactId>discovery-plugin-config-center</artifactId>
+    <name>Nepxion Discovery Plugin Config Center</name>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
@@ -22,7 +22,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>eventbus-aop</artifactId>
+            <artifactId>eventbus-aop-starter</artifactId>
         </dependency>
 
         <dependency>

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

-package com.nepxion.discovery.plugin.configuration;
+package com.nepxion.discovery.plugin.configcenter;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -22,8 +22,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.nepxion.discovery.plugin.configuration.constant.ConfigurationConstant;
-import com.nepxion.discovery.plugin.configuration.xml.Dom4JParser;
+import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
+import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
 import com.nepxion.discovery.plugin.core.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.core.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.core.entity.PluginEntity;
@@ -31,8 +31,8 @@ import com.nepxion.discovery.plugin.core.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.core.entity.RegisterFilterType;
 import com.nepxion.discovery.plugin.core.exception.PluginException;
 
-public class ConfigurationParser extends Dom4JParser {
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigurationParser.class);
+public class ConfigParser extends Dom4JParser {
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);
 
     @Autowired
     private PluginEntity pluginEntity;
@@ -45,14 +45,14 @@ public class ConfigurationParser extends Dom4JParser {
     protected void parseRoot(Element element) {
         LOG.info("Start to parse plugin xml...");
 
-        int registerElementCount = element.elements(ConfigurationConstant.REGISTER_ELEMENT_NAME).size();
+        int registerElementCount = element.elements(ConfigConstant.REGISTER_ELEMENT_NAME).size();
         if (registerElementCount > 1) {
-            throw new PluginException("The count of element[" + ConfigurationConstant.REGISTER_ELEMENT_NAME + "] can't be more than 1");
+            throw new PluginException("The count of element[" + ConfigConstant.REGISTER_ELEMENT_NAME + "] can't be more than 1");
         }
 
-        int discoveryElementCount = element.elements(ConfigurationConstant.DISCOVERY_ELEMENT_NAME).size();
+        int discoveryElementCount = element.elements(ConfigConstant.DISCOVERY_ELEMENT_NAME).size();
         if (discoveryElementCount > 1) {
-            throw new PluginException("The count of element[" + ConfigurationConstant.DISCOVERY_ELEMENT_NAME + "] can't be more than 1");
+            throw new PluginException("The count of element[" + ConfigConstant.DISCOVERY_ELEMENT_NAME + "] can't be more than 1");
         }
 
         RegisterEntity registerEntity = null;
@@ -62,10 +62,10 @@ public class ConfigurationParser extends Dom4JParser {
             if (childElementObject instanceof Element) {
                 Element childElement = (Element) childElementObject;
 
-                if (StringUtils.equals(childElement.getName(), ConfigurationConstant.REGISTER_ELEMENT_NAME)) {
+                if (StringUtils.equals(childElement.getName(), ConfigConstant.REGISTER_ELEMENT_NAME)) {
                     registerEntity = new RegisterEntity();
                     parseRegister(childElement, registerEntity);
-                } else if (StringUtils.equals(childElement.getName(), ConfigurationConstant.DISCOVERY_ELEMENT_NAME)) {
+                } else if (StringUtils.equals(childElement.getName(), ConfigConstant.DISCOVERY_ELEMENT_NAME)) {
                     discoveryEntity = new DiscoveryEntity();
                     parseDiscovery(childElement, discoveryEntity);
                 }
@@ -86,14 +86,14 @@ public class ConfigurationParser extends Dom4JParser {
 
     @SuppressWarnings("rawtypes")
     private void parseRegister(Element element, RegisterEntity registerEntity) {
-        Attribute filterTypeAttribute = element.attribute(ConfigurationConstant.FILTER_TYPE_ATTRIBUTE_NAME);
+        Attribute filterTypeAttribute = element.attribute(ConfigConstant.FILTER_TYPE_ATTRIBUTE_NAME);
         if (filterTypeAttribute == null) {
-            throw new PluginException("Attribute[" + ConfigurationConstant.FILTER_TYPE_ATTRIBUTE_NAME + "] in element[" + element.getName() + "] is missing");
+            throw new PluginException("Attribute[" + ConfigConstant.FILTER_TYPE_ATTRIBUTE_NAME + "] in element[" + element.getName() + "] is missing");
         }
         String filterType = filterTypeAttribute.getData().toString().trim();
         registerEntity.setFilterType(RegisterFilterType.fromString(filterType));
 
-        Attribute globalFilterAttribute = element.attribute(ConfigurationConstant.FILTER_VALUE_ATTRIBUTE_NAME);
+        Attribute globalFilterAttribute = element.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME);
         if (globalFilterAttribute != null) {
             String globalFilterValue = globalFilterAttribute.getData().toString().trim();
             registerEntity.setFilterValue(globalFilterValue);
@@ -106,13 +106,13 @@ public class ConfigurationParser extends Dom4JParser {
             if (childElementObject instanceof Element) {
                 Element childElement = (Element) childElementObject;
 
-                Attribute serviceNameAttribute = childElement.attribute(ConfigurationConstant.SERVICE_NAME_ATTRIBUTE_NAME);
+                Attribute serviceNameAttribute = childElement.attribute(ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME);
                 if (serviceNameAttribute == null) {
-                    throw new PluginException("Attribute[" + ConfigurationConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
+                    throw new PluginException("Attribute[" + ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
                 }
                 String serviceName = serviceNameAttribute.getData().toString().trim();
 
-                Attribute filterValueAttribute = childElement.attribute(ConfigurationConstant.FILTER_VALUE_ATTRIBUTE_NAME);
+                Attribute filterValueAttribute = childElement.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME);
                 String filterValue = null;
                 if (filterValueAttribute != null) {
                     filterValue = filterValueAttribute.getData().toString().trim();
@@ -132,27 +132,27 @@ public class ConfigurationParser extends Dom4JParser {
 
                 DiscoveryServiceEntity serviceEntity = new DiscoveryServiceEntity();
 
-                Attribute consumerServiceNameAttribute = childElement.attribute(ConfigurationConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME);
+                Attribute consumerServiceNameAttribute = childElement.attribute(ConfigConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME);
                 if (consumerServiceNameAttribute == null) {
-                    throw new PluginException("Attribute[" + ConfigurationConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
+                    throw new PluginException("Attribute[" + ConfigConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
                 }
                 String consumerServiceName = consumerServiceNameAttribute.getData().toString().trim();
                 serviceEntity.setConsumerServiceName(consumerServiceName);
 
-                Attribute providerServiceNameAttribute = childElement.attribute(ConfigurationConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME);
+                Attribute providerServiceNameAttribute = childElement.attribute(ConfigConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME);
                 if (providerServiceNameAttribute == null) {
-                    throw new PluginException("Attribute[" + ConfigurationConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
+                    throw new PluginException("Attribute[" + ConfigConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
                 }
                 String providerServiceName = providerServiceNameAttribute.getData().toString().trim();
                 serviceEntity.setProviderServiceName(providerServiceName);
 
-                Attribute consumerVersionValueAttribute = childElement.attribute(ConfigurationConstant.CONSUMER_VERSION_VALUE_ATTRIBUTE_NAME);
+                Attribute consumerVersionValueAttribute = childElement.attribute(ConfigConstant.CONSUMER_VERSION_VALUE_ATTRIBUTE_NAME);
                 if (consumerVersionValueAttribute != null) {
                     String consumerVersionValue = consumerVersionValueAttribute.getData().toString().trim();
                     serviceEntity.setConsumerVersionValue(consumerVersionValue);
                 }
 
-                Attribute providerVersionValueAttribute = childElement.attribute(ConfigurationConstant.PROVIDER_VERSION_VALUE_ATTRIBUTE_NAME);
+                Attribute providerVersionValueAttribute = childElement.attribute(ConfigConstant.PROVIDER_VERSION_VALUE_ATTRIBUTE_NAME);
                 if (providerVersionValueAttribute != null) {
                     String providerVersionValue = providerVersionValueAttribute.getData().toString().trim();
                     serviceEntity.setProviderVersionValue(providerVersionValue);

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/ConfigurationPublisher.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigPublisher.java

-package com.nepxion.discovery.plugin.configuration;
+package com.nepxion.discovery.plugin.configcenter;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.nepxion.eventbus.core.Event;
 import com.nepxion.eventbus.core.EventControllerFactory;
 
-public class ConfigurationPublisher {
+public class ConfigPublisher {
     @Autowired
     private EventControllerFactory eventControllerFactory;
 

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/ConfigurationRetriever.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigRetriever.java

-package com.nepxion.discovery.plugin.configuration;
+package com.nepxion.discovery.plugin.configcenter;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -20,24 +20,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
 import com.google.common.eventbus.Subscribe;
-import com.nepxion.discovery.plugin.configuration.constant.ConfigurationConstant;
-import com.nepxion.discovery.plugin.configuration.loader.ConfigurationLoader;
+import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
+import com.nepxion.discovery.plugin.configcenter.loader.ConfigLoader;
 import com.nepxion.discovery.plugin.core.exception.PluginException;
 import com.nepxion.eventbus.annotation.EventBus;
 import com.nepxion.eventbus.core.Event;
 
 @EventBus
-public class ConfigurationRetriever {
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigurationRetriever.class);
+public class ConfigRetriever {
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigRetriever.class);
 
-    @Value("${" + ConfigurationConstant.SPRING_APPLICATION_DISCOVERY_REMOTE_CONFIG_ENABLED + ":false}")
+    @Value("${" + ConfigConstant.SPRING_APPLICATION_DISCOVERY_REMOTE_CONFIG_ENABLED + ":false}")
     private Boolean remoteConfigEnabled;
 
     @Autowired
-    private ConfigurationLoader configurationLoader;
+    private ConfigLoader configLoader;
 
     @Autowired
-    private ConfigurationParser configurationParser;
+    private ConfigParser configParser;
 
     public void initialize() throws PluginException {
         LOG.info("********** {} config starts to initialize **********", remoteConfigEnabled ? "Remote" : "Local");
@@ -45,9 +45,9 @@ public class ConfigurationRetriever {
         InputStream inputStream = null;
         try {
             if (remoteConfigEnabled) {
-                inputStream = configurationLoader.getRemoteInputStream();
+                inputStream = configLoader.getRemoteInputStream();
             } else {
-                inputStream = configurationLoader.getLocalInputStream();
+                inputStream = configLoader.getLocalInputStream();
             }
             parse(inputStream);
         } catch (IOException e) {
@@ -88,6 +88,6 @@ public class ConfigurationRetriever {
             throw new PluginException("Failed to load " + (remoteConfigEnabled ? "remote" : "local") + " config, no input stream returns");
         }
 
-        configurationParser.parse(inputStream);
+        configParser.parse(inputStream);
     }
 }
\ No newline at end of file

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/config/ConfigurationConfig.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/configuration/ConfigAutoConfiguration.java

-package com.nepxion.discovery.plugin.configuration.config;
+package com.nepxion.discovery.plugin.configcenter.configuration;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -15,32 +15,32 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.nepxion.discovery.plugin.configuration.ConfigurationParser;
-import com.nepxion.discovery.plugin.configuration.ConfigurationPublisher;
-import com.nepxion.discovery.plugin.configuration.ConfigurationRetriever;
+import com.nepxion.discovery.plugin.configcenter.ConfigParser;
+import com.nepxion.discovery.plugin.configcenter.ConfigPublisher;
+import com.nepxion.discovery.plugin.configcenter.ConfigRetriever;
 
 @Configuration
-public class ConfigurationConfig {
+public class ConfigAutoConfiguration {
     @Autowired
-    private ConfigurationRetriever configurationRetriever;
+    private ConfigRetriever configRetriever;
 
     @Bean
-    public ConfigurationParser configurationParser() {
-        return new ConfigurationParser();
+    public ConfigParser configParser() {
+        return new ConfigParser();
     }
 
     @Bean
-    public ConfigurationRetriever configurationRetriever() {
-        return new ConfigurationRetriever();
+    public ConfigRetriever configRetriever() {
+        return new ConfigRetriever();
     }
 
     @Bean
-    public ConfigurationPublisher configurationPoster() {
-        return new ConfigurationPublisher();
+    public ConfigPublisher configPublisher() {
+        return new ConfigPublisher();
     }
 
     @PostConstruct
     public void initialize() {
-        configurationRetriever.initialize();
+        configRetriever.initialize();
     }
 }
\ No newline at end of file

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/constant/ConfigurationConstant.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/constant/ConfigConstant.java

-package com.nepxion.discovery.plugin.configuration.constant;
+package com.nepxion.discovery.plugin.configcenter.constant;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.configuration.constant;
  * @version 1.0
  */
 
-public class ConfigurationConstant {
+public class ConfigConstant {
     public static final String SPRING_APPLICATION_DISCOVERY_REMOTE_CONFIG_ENABLED = "spring.application.discovery.remote.config.enabled";
 
     public static final String RULE_ELEMENT_NAME = "rule";

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/loader/AbstractConfigurationLoader.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/loader/AbstractConfigLoader.java

-package com.nepxion.discovery.plugin.configuration.loader;
+package com.nepxion.discovery.plugin.configcenter.loader;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -16,7 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
-public abstract class AbstractConfigurationLoader implements ConfigurationLoader {
+public abstract class AbstractConfigLoader implements ConfigLoader {
     @Autowired
     private ApplicationContext applicationContext;
 

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/loader/ConfigurationLoader.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/loader/ConfigLoader.java

-package com.nepxion.discovery.plugin.configuration.loader;
+package com.nepxion.discovery.plugin.configcenter.loader;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.configuration.loader;
 import java.io.IOException;
 import java.io.InputStream;
 
-public interface ConfigurationLoader {
+public interface ConfigLoader {
     InputStream getLocalInputStream() throws IOException;
 
     InputStream getRemoteInputStream() throws IOException;

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/xml/Dom4JConstant.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/xml/Dom4JConstant.java

-package com.nepxion.discovery.plugin.configuration.xml;
+package com.nepxion.discovery.plugin.configcenter.xml;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/xml/Dom4JParser.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/xml/Dom4JParser.java

-package com.nepxion.discovery.plugin.configuration.xml;
+package com.nepxion.discovery.plugin.configcenter.xml;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/xml/Dom4JReader.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/xml/Dom4JReader.java

-package com.nepxion.discovery.plugin.configuration.xml;
+package com.nepxion.discovery.plugin.configcenter.xml;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-configuration/src/main/java/com/nepxion/discovery/plugin/configuration/xml/Dom4JWriter.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/xml/Dom4JWriter.java

-package com.nepxion.discovery.plugin.configuration.xml;
+package com.nepxion.discovery.plugin.configcenter.xml;
 
 /**
  * <p>Title: Nepxion Discovery</p>

pom.xml

@@ -13,7 +13,7 @@
     <modules>
         <module>discovery-plugin-core</module>
         <module>discovery-plugin-actuator</module>
-        <module>discovery-plugin-configuration</module>
+        <module>discovery-plugin-config-center</module>
         <module>discovery-plugin-starter</module>
         <module>discovery-springcloud-example-a</module>
         <module>discovery-springcloud-example-b1</module>
@@ -22,7 +22,7 @@
     </modules>
 
     <properties>
-        <eventbus.version>1.0.6</eventbus.version>
+        <eventbus.version>1.0.8</eventbus.version>
         <commons.lang3.version>3.6</commons.lang3.version>
         <commons.collections4.version>4.1</commons.collections4.version>
         <commons.io.version>2.5</commons.io.version>
@@ -51,7 +51,7 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>discovery-plugin-configuration</artifactId>
+                <artifactId>discovery-plugin-config-center</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -63,7 +63,7 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>eventbus-aop</artifactId>
+                <artifactId>eventbus-aop-starter</artifactId>
                 <version>${eventbus.version}</version>
             </dependency>