重构类结构

discovery-plugin-actuator/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>discovery-plugin-core</artifactId>
+            <artifactId>discovery-plugin-framework</artifactId>
         </dependency>
 
         <dependency>

discovery-plugin-actuator/src/main/java/com/nepxion/discovery/plugin/actuator/endpoint/ActuatorEndpoint.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.nepxion.discovery.plugin.core.cache.PluginCache;
+import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 
 @ManagedResource(description = "Discovery endpoint")
 public class ActuatorEndpoint implements MvcEndpoint, ApplicationContextAware, EnvironmentAware {

discovery-plugin-config-center/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>discovery-plugin-core</artifactId>
+            <artifactId>discovery-plugin-framework</artifactId>
         </dependency>
 
         <dependency>

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

@@ -24,12 +24,12 @@ 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.core.entity.DiscoveryEntity;
-import com.nepxion.discovery.plugin.core.entity.DiscoveryServiceEntity;
-import com.nepxion.discovery.plugin.core.entity.PluginEntity;
-import com.nepxion.discovery.plugin.core.entity.RegisterEntity;
-import com.nepxion.discovery.plugin.core.entity.RegisterFilterType;
-import com.nepxion.discovery.plugin.core.exception.PluginException;
+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.RegisterEntity;
+import com.nepxion.discovery.plugin.framework.entity.RegisterFilterType;
+import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
 public class ConfigParser extends Dom4JParser {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);

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

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
 import com.google.common.eventbus.Subscribe;
 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.discovery.plugin.framework.exception.PluginException;
 import com.nepxion.eventbus.annotation.EventBus;
 import com.nepxion.eventbus.core.Event;
 

discovery-plugin-core/pom.xml → discovery-plugin-framework/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-core</artifactId>
-    <name>Nepxion Discovery Plugin Core</name>
+    <artifactId>discovery-plugin-framework</artifactId>
+    <name>Nepxion Discovery Plugin Framework</name>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/cache/PluginCache.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/cache/PluginCache.java

-package com.nepxion.discovery.plugin.core.cache;
+package com.nepxion.discovery.plugin.framework.cache;
 
 /**
  * <p>Title: Nepxion Discovery</p>

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

-package com.nepxion.discovery.plugin.core.configuration;
+package com.nepxion.discovery.plugin.framework.configuration;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -14,10 +14,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.nepxion.discovery.plugin.core.cache.PluginCache;
-import com.nepxion.discovery.plugin.core.entity.PluginEntity;
-import com.nepxion.discovery.plugin.core.strategy.DiscoveryStrategy;
-import com.nepxion.discovery.plugin.core.strategy.RegisterStrategy;
+import com.nepxion.discovery.plugin.framework.cache.PluginCache;
+import com.nepxion.discovery.plugin.framework.entity.PluginEntity;
+import com.nepxion.discovery.plugin.framework.strategy.DiscoveryStrategy;
+import com.nepxion.discovery.plugin.framework.strategy.RegisterStrategy;
 
 @Configuration
 public class PluginAutoConfiguration {

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/constant/PluginConstant.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/constant/PluginConstant.java

-package com.nepxion.discovery.plugin.core.constant;
+package com.nepxion.discovery.plugin.framework.constant;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/context/PluginApplicationContextInitializer.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/context/PluginApplicationContextInitializer.java

-package com.nepxion.discovery.plugin.core.context;
+package com.nepxion.discovery.plugin.framework.context;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -17,8 +17,8 @@ import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceReg
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.nepxion.discovery.plugin.core.decorator.DiscoveryClientDecorator;
-import com.nepxion.discovery.plugin.core.decorator.EurekaServiceRegistryDecorator;
+import com.nepxion.discovery.plugin.framework.decorator.DiscoveryClientDecorator;
+import com.nepxion.discovery.plugin.framework.decorator.EurekaServiceRegistryDecorator;
 
 public class PluginApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
     @Override

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/decorator/DiscoveryClientDecorator.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/decorator/DiscoveryClientDecorator.java

-package com.nepxion.discovery.plugin.core.decorator;
+package com.nepxion.discovery.plugin.framework.decorator;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -16,8 +16,8 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-import com.nepxion.discovery.plugin.core.constant.PluginConstant;
-import com.nepxion.discovery.plugin.core.strategy.DiscoveryStrategy;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
+import com.nepxion.discovery.plugin.framework.strategy.DiscoveryStrategy;
 
 public class DiscoveryClientDecorator implements DiscoveryClient {
     private DiscoveryClient discoveryClient;

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/decorator/EurekaServiceRegistryDecorator.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/decorator/EurekaServiceRegistryDecorator.java

-package com.nepxion.discovery.plugin.core.decorator;
+package com.nepxion.discovery.plugin.framework.decorator;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -15,7 +15,7 @@ import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceReg
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-import com.nepxion.discovery.plugin.core.strategy.RegisterStrategy;
+import com.nepxion.discovery.plugin.framework.strategy.RegisterStrategy;
 
 public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
     private ServiceRegistry<EurekaRegistration> serviceRegistry;

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/entity/DiscoveryEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/DiscoveryEntity.java

-package com.nepxion.discovery.plugin.core.entity;
+package com.nepxion.discovery.plugin.framework.entity;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/entity/DiscoveryServiceEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/DiscoveryServiceEntity.java

-package com.nepxion.discovery.plugin.core.entity;
+package com.nepxion.discovery.plugin.framework.entity;
 
 /**
  * <p>Title: Nepxion Discovery</p>

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

-package com.nepxion.discovery.plugin.core.entity;
+package com.nepxion.discovery.plugin.framework.entity;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/entity/RegisterEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/RegisterEntity.java

-package com.nepxion.discovery.plugin.core.entity;
+package com.nepxion.discovery.plugin.framework.entity;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/entity/RegisterFilterType.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/RegisterFilterType.java

-package com.nepxion.discovery.plugin.core.entity;
+package com.nepxion.discovery.plugin.framework.entity;
 
 /**
  * <p>Title: Nepxion Discovery</p>

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/exception/PluginException.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/exception/PluginException.java

-package com.nepxion.discovery.plugin.core.exception;
+package com.nepxion.discovery.plugin.framework.exception;
 
 /**
  * <p>Title: Nepxion Discovery</p>

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

-package com.nepxion.discovery.plugin.core.strategy;
+package com.nepxion.discovery.plugin.framework.strategy;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -22,11 +22,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 
-import com.nepxion.discovery.plugin.core.cache.PluginCache;
-import com.nepxion.discovery.plugin.core.constant.PluginConstant;
-import com.nepxion.discovery.plugin.core.entity.DiscoveryEntity;
-import com.nepxion.discovery.plugin.core.entity.DiscoveryServiceEntity;
-import com.nepxion.discovery.plugin.core.entity.PluginEntity;
+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;
 
 public class DiscoveryStrategy {
     @Autowired

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

-package com.nepxion.discovery.plugin.core.strategy;
+package com.nepxion.discovery.plugin.framework.strategy;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -17,11 +17,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.nepxion.discovery.plugin.core.constant.PluginConstant;
-import com.nepxion.discovery.plugin.core.entity.PluginEntity;
-import com.nepxion.discovery.plugin.core.entity.RegisterEntity;
-import com.nepxion.discovery.plugin.core.entity.RegisterFilterType;
-import com.nepxion.discovery.plugin.core.exception.PluginException;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
+import com.nepxion.discovery.plugin.framework.entity.PluginEntity;
+import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
+import com.nepxion.discovery.plugin.framework.entity.RegisterFilterType;
+import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
 public class RegisterStrategy {
     private static final Logger LOG = LoggerFactory.getLogger(RegisterStrategy.class);

discovery-plugin-core/src/main/java/com/nepxion/discovery/plugin/core/util/BeanRegisterUtil.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/util/BeanRegisterUtil.java

-package com.nepxion.discovery.plugin.core.util;
+package com.nepxion.discovery.plugin.framework.util;
 
 /**
  * <p>Title: Nepxion Discovery</p>

pom.xml

@@ -11,7 +11,7 @@
     <url>http://www.nepxion.com</url>
 
     <modules>
-        <module>discovery-plugin-core</module>
+        <module>discovery-plugin-framework</module>
         <module>discovery-plugin-actuator</module>
         <module>discovery-plugin-config-center</module>
         <module>discovery-plugin-starter</module>
@@ -39,7 +39,7 @@
         <dependencies>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>discovery-plugin-core</artifactId>
+                <artifactId>discovery-plugin-framework</artifactId>
                 <version>${project.version}</version>
             </dependency>