重构策略模块

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

@@ -9,8 +9,6 @@ package com.nepxion.discovery.plugin.strategy.extension.gateway.adapter;
  * @version 1.0
  */
 
-import org.springframework.http.server.reactive.ServerHttpRequest;
-
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.plugin.strategy.adapter.AbstractVersionDiscoveryEnabledAdapter;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewayStrategyContext;
@@ -18,17 +16,8 @@ import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewaySt
 public class VersionDiscoveryEnabledAdapter extends AbstractVersionDiscoveryEnabledAdapter {
     @Override
     protected String getVersionJson() {
-        ServerHttpRequest request = getRequest();
-        if (request == null) {
-            return null;
-        }
-
-        return request.getHeaders().getFirst(DiscoveryConstant.VERSION);
-    }
-
-    public ServerHttpRequest getRequest() {
         GatewayStrategyContext context = GatewayStrategyContext.getCurrentContext();
 
-        return context.getExchange().getRequest();
+        return context.getExchange().getRequest().getHeaders().getFirst(DiscoveryConstant.VERSION);
     }
 }
\ No newline at end of file

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

@@ -9,8 +9,6 @@ package com.nepxion.discovery.plugin.strategy.extension.service.adapter;
  * @version 1.0
  */
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -20,20 +18,11 @@ import com.nepxion.discovery.plugin.strategy.adapter.AbstractVersionDiscoveryEna
 public class VersionDiscoveryEnabledAdapter extends AbstractVersionDiscoveryEnabledAdapter {
     @Override
     protected String getVersionJson() {
-        HttpServletRequest request = getRequest();
-        if (request == null) {
-            return null;
-        }
-
-        return request.getHeader(DiscoveryConstant.VERSION);
-    }
-
-    public HttpServletRequest getRequest() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes == null) {
             return null;
         }
 
-        return attributes.getRequest();
+        return attributes.getRequest().getHeader(DiscoveryConstant.VERSION);
     }
 }
\ No newline at end of file

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

@@ -9,8 +9,6 @@ package com.nepxion.discovery.plugin.strategy.extension.zuul.adapter;
  * @version 1.0
  */
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.plugin.strategy.adapter.AbstractVersionDiscoveryEnabledAdapter;
 import com.netflix.zuul.context.RequestContext;
@@ -18,17 +16,8 @@ import com.netflix.zuul.context.RequestContext;
 public class VersionDiscoveryEnabledAdapter extends AbstractVersionDiscoveryEnabledAdapter {
     @Override
     protected String getVersionJson() {
-        HttpServletRequest request = getRequest();
-        if (request == null) {
-            return null;
-        }
-
-        return request.getHeader(DiscoveryConstant.VERSION);
-    }
-
-    public HttpServletRequest getRequest() {
         RequestContext context = RequestContext.getCurrentContext();
 
-        return context.getRequest();
+        return context.getRequest().getHeader(DiscoveryConstant.VERSION);
     }
 }
\ No newline at end of file