重构策略模块

discovery-plugin-strategy-extension-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/extension/gateway/adapter/VersionDiscoveryEnabledAdapter.java

@@ -17,13 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter;
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewayStrategyContext;
 import com.netflix.loadbalancer.Server;
 
 public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     @Autowired(required = false)
-    private DiscoveryEnabledExtension discoveryEnabledExtension;
+    private DiscoveryEnabledStrategy discoveryEnabledStrategy;
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {
@@ -63,10 +63,10 @@ public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     }
 
     private boolean applyExtension(Server server, Map<String, String> metadata) {
-        if (discoveryEnabledExtension == null) {
+        if (discoveryEnabledStrategy == null) {
             return true;
         }
 
-        return discoveryEnabledExtension.apply(server, metadata);
+        return discoveryEnabledStrategy.apply(server, metadata);
     }
 }
\ No newline at end of file

discovery-plugin-strategy-extension-service/src/main/java/com/nepxion/discovery/plugin/strategy/extension/service/adapter/VersionDiscoveryEnabledAdapter.java

@@ -19,12 +19,12 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter;
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.netflix.loadbalancer.Server;
 
 public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     @Autowired(required = false)
-    private DiscoveryEnabledExtension discoveryEnabledExtension;
+    private DiscoveryEnabledStrategy discoveryEnabledStrategy;
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {
@@ -68,10 +68,10 @@ public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     }
 
     private boolean applyExtension(Server server, Map<String, String> metadata) {
-        if (discoveryEnabledExtension == null) {
+        if (discoveryEnabledStrategy == null) {
             return true;
         }
 
-        return discoveryEnabledExtension.apply(server, metadata);
+        return discoveryEnabledStrategy.apply(server, metadata);
     }
 }
\ No newline at end of file

discovery-plugin-strategy-extension-zuul/src/main/java/com/nepxion/discovery/plugin/strategy/extension/zuul/adapter/VersionDiscoveryEnabledAdapter.java

@@ -17,13 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter;
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.netflix.loadbalancer.Server;
 import com.netflix.zuul.context.RequestContext;
 
 public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     @Autowired(required = false)
-    private DiscoveryEnabledExtension discoveryEnabledExtension;
+    private DiscoveryEnabledStrategy discoveryEnabledStrategy;
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {
@@ -63,10 +63,10 @@ public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
     }
 
     private boolean applyExtension(Server server, Map<String, String> metadata) {
-        if (discoveryEnabledExtension == null) {
+        if (discoveryEnabledStrategy == null) {
             return true;
         }
 
-        return discoveryEnabledExtension.apply(server, metadata);
+        return discoveryEnabledStrategy.apply(server, metadata);
     }
 }
\ No newline at end of file

discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/extension/DiscoveryEnabledExtension.java → discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/adapter/DiscoveryEnabledStrategy.java

-package com.nepxion.discovery.plugin.strategy.extension;
+package com.nepxion.discovery.plugin.strategy.adapter;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -13,6 +13,6 @@ import java.util.Map;
 
 import com.netflix.loadbalancer.Server;
 
-public interface DiscoveryEnabledExtension {
+public interface DiscoveryEnabledStrategy {
     boolean apply(Server server, Map<String, String> metadata);
 }
\ No newline at end of file

discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/DiscoveryApplicationGateway.java

@@ -14,7 +14,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 
-import com.nepxion.discovery.plugin.example.gateway.extension.MyDiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.example.gateway.extension.MyDiscoveryEnabledStrategy;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -24,8 +24,8 @@ public class DiscoveryApplicationGateway {
     }
 
     @Bean
-    public MyDiscoveryEnabledExtension myDiscoveryEnabledExtension() {
-        return new MyDiscoveryEnabledExtension();
+    public MyDiscoveryEnabledStrategy myDiscoveryEnabledStrategy() {
+        return new MyDiscoveryEnabledStrategy();
     }
 
     /*@Bean

discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/extension/MyDiscoveryEnabledExtension.java → discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/extension/MyDiscoveryEnabledStrategy.java

@@ -15,13 +15,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewayStrategyContext;
 import com.netflix.loadbalancer.Server;
 
 // 实现了组合策略，版本路由策略+自定义策略
-public class MyDiscoveryEnabledExtension implements DiscoveryEnabledExtension {
-    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledExtension.class);
+public class MyDiscoveryEnabledStrategy implements DiscoveryEnabledStrategy {
+    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledStrategy.class);
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {

discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/DiscoveryApplicationA1.java

@@ -18,7 +18,7 @@ import org.springframework.context.annotation.Bean;
 import com.nepxion.discovery.plugin.example.service.extension.MyDiscoveryListener;
 import com.nepxion.discovery.plugin.example.service.extension.MyLoadBalanceListener;
 import com.nepxion.discovery.plugin.example.service.extension.MyRegisterListener;
-import com.nepxion.discovery.plugin.example.service.extension.MyDiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.example.service.extension.MyDiscoveryEnabledStrategy;
 import com.nepxion.discovery.plugin.example.service.extension.MySubscriber;
 
 @SpringBootApplication
@@ -52,7 +52,7 @@ public class DiscoveryApplicationA1 {
     }
 
     @Bean
-    public MyDiscoveryEnabledExtension myDiscoveryEnabledExtension() {
-        return new MyDiscoveryEnabledExtension();
+    public MyDiscoveryEnabledStrategy myDiscoveryEnabledStrategy() {
+        return new MyDiscoveryEnabledStrategy();
     }
 }
\ No newline at end of file

discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/extension/MyDiscoveryEnabledExtension.java → discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/extension/MyDiscoveryEnabledStrategy.java

@@ -18,14 +18,14 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.nepxion.discovery.plugin.strategy.extension.service.constant.ServiceStrategyConstant;
 import com.nepxion.discovery.plugin.strategy.extension.service.context.ServiceStrategyContext;
 import com.netflix.loadbalancer.Server;
 
 // 实现了组合策略，版本路由策略+自定义策略
-public class MyDiscoveryEnabledExtension implements DiscoveryEnabledExtension {
-    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledExtension.class);
+public class MyDiscoveryEnabledStrategy implements DiscoveryEnabledStrategy {
+    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledStrategy.class);
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {

discovery-springcloud-example-zuul/src/main/java/com/nepxion/discovery/plugin/example/zuul/DiscoveryApplicationZuul.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 import org.springframework.context.annotation.Bean;
 
-import com.nepxion.discovery.plugin.example.zuul.extension.MyDiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.example.zuul.extension.MyDiscoveryEnabledStrategy;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -26,7 +26,7 @@ public class DiscoveryApplicationZuul {
     }
 
     @Bean
-    public MyDiscoveryEnabledExtension myDiscoveryEnabledExtension() {
-        return new MyDiscoveryEnabledExtension();
+    public MyDiscoveryEnabledStrategy myDiscoveryEnabledStrategy() {
+        return new MyDiscoveryEnabledStrategy();
     }
 }
\ No newline at end of file

discovery-springcloud-example-zuul/src/main/java/com/nepxion/discovery/plugin/example/zuul/extension/MyDiscoveryEnabledExtension.java → discovery-springcloud-example-zuul/src/main/java/com/nepxion/discovery/plugin/example/zuul/extension/MyDiscoveryEnabledStrategy.java

@@ -15,13 +15,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.nepxion.discovery.plugin.strategy.extension.DiscoveryEnabledExtension;
+import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledStrategy;
 import com.netflix.loadbalancer.Server;
 import com.netflix.zuul.context.RequestContext;
 
 // 实现了组合策略，版本路由策略+自定义策略
-public class MyDiscoveryEnabledExtension implements DiscoveryEnabledExtension {
-    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledExtension.class);
+public class MyDiscoveryEnabledStrategy implements DiscoveryEnabledStrategy {
+    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledStrategy.class);
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {