You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by de...@apache.org on 2021/09/26 05:11:08 UTC
[incubator-shenyu] branch master updated: [type: refactor] refactor
code (#2123)
This is an automated email from the ASF dual-hosted git repository.
dengliming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 60cb938 [type: refactor] refactor code (#2123)
60cb938 is described below
commit 60cb9382dc3b8ade1ce4ba65c18a59d82495579e
Author: xiaoyu <xi...@apache.org>
AuthorDate: Sun Sep 26 13:11:00 2021 +0800
[type: refactor] refactor code (#2123)
* [type: refactor] refactor code
* [type: refactor] refactor code
* [type: refactor] refactor code
* [type: refactor] refactor code
* [type: refactor] refactor code
* [type: refactor] refactor code
* [type: refactor] refactor code
---
.../subscriber/MetadataExecutorSubscriber.java | 3 +-
.../subscriber/URIRegisterExecutorSubscriber.java | 4 +-
.../shenyu/admin/utils/DivideUpstreamUtils.java | 2 +-
.../org/apache/shenyu/admin/utils/JwtUtils.java | 2 +-
.../dto/convert/selector/DivideUpstream.java | 7 +---
.../dto/convert/selector/DubboSelectorHandle.java | 5 +--
.../selector/SpringCloudSelectorHandle.java | 5 +--
.../dto/convert/selector/WebSocketUpstream.java | 5 +--
.../apache/shenyu/common/enums/RpcTypeEnum.java | 4 +-
.../shenyu/common/enums/RpcTypeEnumTest.java | 1 -
.../handler/ApacheDubboPluginDataHandler.java | 6 +--
.../dubbo/proxy/ApacheDubboProxyService.java | 8 ++--
...RuleHandleCache.java => CommonHandleCache.java} | 2 +-
...leCacheTest.java => CommonHandleCacheTest.java} | 24 +++++------
...eCache.java => EmptyMockCommonHandleCache.java} | 2 +-
.../path/handler/ContextPathPluginDataHandler.java | 4 +-
.../handler/CryptorRequestPluginDataHandler.java | 4 +-
.../handler/CryptorResponsePluginDataHandler.java | 4 +-
.../cryptor/request/CryptorRequestPlugin.java | 4 +-
.../cryptor/response/CryptorResponsePlugin.java | 3 +-
.../cryptor/strategy/CryptorStrategyFactory.java | 1 -
.../divide/handler/DividePluginDataHandler.java | 4 +-
.../hystrix/handler/HystrixPluginDataHandler.java | 10 ++---
...e.java => ModifyResponseCommonHandleCache.java} | 10 ++---
.../handler/ModifyResponsePluginDataHandler.java | 4 +-
...va => ModifyResponseCommonHandleCacheTest.java} | 6 +--
.../handler/ParamMappingPluginDataHandler.java | 4 +-
.../handler/ParamMappingPluginDataTest.java | 4 +-
.../handler/RateLimiterPluginDataHandler.java | 4 +-
.../handler/RedirectPluginDataHandler.java | 4 +-
.../request/handler/RequestPluginHandler.java | 4 +-
.../resilience4j/handler/Resilience4JHandler.java | 4 +-
.../rewrite/handler/RewritePluginDataHandler.java | 4 +-
.../plugin/springcloud/SpringCloudPlugin.java | 10 ++---
.../cache/SpringCloudRuleHandleCache.java | 49 ----------------------
.../cache/SpringCloudSelectorHandleCache.java | 49 ----------------------
.../handler/SpringCloudPluginDataHandler.java | 21 ++++++----
.../springcloud/loadbalance/LoadBalanceRule.java | 12 ++----
.../plugin/springcloud/SpringCloudPluginTest.java | 21 +++++-----
.../plugin/waf/handler/WafPluginDataHandler.java | 4 +-
.../handler/WebSocketPluginDataHandler.java | 4 +-
.../nacos/NacosServerRegisterRepository.java | 6 ---
.../nacos/NacosServerRegisterRepositoryTest.java | 6 +--
.../ZookeeperServerRegisterRepositoryTest.java | 13 +++---
44 files changed, 116 insertions(+), 241 deletions(-)
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/MetadataExecutorSubscriber.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/MetadataExecutorSubscriber.java
index c3fe490..19a7e28 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/MetadataExecutorSubscriber.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/MetadataExecutorSubscriber.java
@@ -47,8 +47,7 @@ public class MetadataExecutorSubscriber implements ExecutorTypeSubscriber<MetaDa
for (MetaDataRegisterDTO metaDataRegisterDTO : metaDataRegisterDTOList) {
ShenyuClientRegisterServiceFactory shenyuClientRegisterServiceFactory = shenyuClientRegisterService.get(metaDataRegisterDTO.getRpcType());
Objects.requireNonNull(shenyuClientRegisterServiceFactory);
-
- synchronized (shenyuClientRegisterServiceFactory) {
+ synchronized (ShenyuClientRegisterServiceFactory.class) {
shenyuClientRegisterServiceFactory.register(metaDataRegisterDTO);
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/URIRegisterExecutorSubscriber.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/URIRegisterExecutorSubscriber.java
index 3d85d75..4cadbc9 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/URIRegisterExecutorSubscriber.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/URIRegisterExecutorSubscriber.java
@@ -52,8 +52,6 @@ public class URIRegisterExecutorSubscriber implements ExecutorTypeSubscriber<URI
@Override
public void executor(final Collection<URIRegisterDTO> dataList) {
Map<String, List<URIRegisterDTO>> listMap = dataList.stream().collect(Collectors.groupingBy(URIRegisterDTO::getContextPath));
- listMap.forEach((contextPath, dtoList) -> {
- shenyuClientRegisterService.get(Constants.DEFAULT.toLowerCase()).registerURIDefault(contextPath, dtoList);
- });
+ listMap.forEach((contextPath, dtoList) -> shenyuClientRegisterService.get(Constants.DEFAULT.toLowerCase()).registerURIDefault(contextPath, dtoList));
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/DivideUpstreamUtils.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/DivideUpstreamUtils.java
index cb52c95..a9baf2c 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/DivideUpstreamUtils.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/DivideUpstreamUtils.java
@@ -45,6 +45,6 @@ public class DivideUpstreamUtils {
* @return String String
*/
public static String buildUrl(final MetaDataRegisterDTO metaDataRegisterDTO) {
- return Optional.ofNullable(String.join(":", metaDataRegisterDTO.getHost(), String.valueOf(metaDataRegisterDTO.getPort()))).orElse(null);
+ return Optional.of(String.join(":", metaDataRegisterDTO.getHost(), String.valueOf(metaDataRegisterDTO.getPort()))).orElse(null);
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/JwtUtils.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/JwtUtils.java
index 4ce8dbe..6a0aa2b 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/JwtUtils.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/JwtUtils.java
@@ -58,7 +58,7 @@ public final class JwtUtils {
*/
public static String getIssuer(final String token) {
DecodedJWT jwt = JWT.decode(token);
- return Optional.ofNullable(jwt).map(item -> item.getClaim("userName").asString()).orElse("");
+ return Optional.of(jwt).map(item -> item.getClaim("userName").asString()).orElse("");
}
/**
diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DivideUpstream.java b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DivideUpstream.java
index 416c8c0..5a8abc7 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DivideUpstream.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DivideUpstream.java
@@ -17,16 +17,13 @@
package org.apache.shenyu.common.dto.convert.selector;
-import java.io.Serializable;
import java.util.Objects;
/**
* this is divide upstream.
*/
-public class DivideUpstream implements Serializable {
-
- private static final long serialVersionUID = 6252280511262542360L;
-
+public class DivideUpstream {
+
/**
* this is http protocol.
*/
diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DubboSelectorHandle.java b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DubboSelectorHandle.java
index f98d37d..7be9ed3 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DubboSelectorHandle.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/DubboSelectorHandle.java
@@ -17,15 +17,12 @@
package org.apache.shenyu.common.dto.convert.selector;
-import java.io.Serializable;
import java.util.Objects;
/**
* The type Dubbo selector handle.
*/
-public class DubboSelectorHandle implements Serializable {
-
- private static final long serialVersionUID = 8965968591478216223L;
+public class DubboSelectorHandle {
/**
* zookeeper url is required.
diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/SpringCloudSelectorHandle.java b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/SpringCloudSelectorHandle.java
index 76dc1c9..80fd435 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/SpringCloudSelectorHandle.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/SpringCloudSelectorHandle.java
@@ -17,16 +17,13 @@
package org.apache.shenyu.common.dto.convert.selector;
-import java.io.Serializable;
import java.util.List;
import java.util.Objects;
/**
* The type Spring cloud selector handle.
*/
-public class SpringCloudSelectorHandle implements Serializable {
-
- private static final long serialVersionUID = -5325946855733519631L;
+public class SpringCloudSelectorHandle {
/**
* this is register eureka serviceId.
diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/WebSocketUpstream.java b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/WebSocketUpstream.java
index d3197bd..6f45844 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/WebSocketUpstream.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/WebSocketUpstream.java
@@ -17,15 +17,12 @@
package org.apache.shenyu.common.dto.convert.selector;
-import java.io.Serializable;
import java.util.Objects;
/**
* this is WebSocket upstream.
*/
-public final class WebSocketUpstream implements Serializable {
-
- private static final long serialVersionUID = 6252280511262542360L;
+public final class WebSocketUpstream {
/**
* host.
diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/RpcTypeEnum.java b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/RpcTypeEnum.java
index 87414f5..b6f543b 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/RpcTypeEnum.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/RpcTypeEnum.java
@@ -118,7 +118,7 @@ public enum RpcTypeEnum {
* @return operator support.
*/
public static List<RpcTypeEnum> acquireSupportURIs() {
- return Arrays.asList(RpcTypeEnum.GRPC, RpcTypeEnum.HTTP, RpcTypeEnum.TARS, RpcTypeEnum.SPRING_CLOUD);
+ return Arrays.asList(RpcTypeEnum.GRPC, RpcTypeEnum.HTTP, RpcTypeEnum.TARS, RpcTypeEnum.SPRING_CLOUD, RpcTypeEnum.DUBBO);
}
/**
@@ -127,7 +127,7 @@ public enum RpcTypeEnum {
* @return operator support.
*/
public static List<RpcTypeEnum> acquireSupportMetadatas() {
- return Arrays.asList(RpcTypeEnum.DUBBO, RpcTypeEnum.GRPC, RpcTypeEnum.HTTP, RpcTypeEnum.SPRING_CLOUD, RpcTypeEnum.SOFA, RpcTypeEnum.TARS);
+ return Arrays.asList(RpcTypeEnum.DUBBO, RpcTypeEnum.GRPC, RpcTypeEnum.SPRING_CLOUD, RpcTypeEnum.SOFA, RpcTypeEnum.TARS, RpcTypeEnum.MOTAN);
}
/**
diff --git a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
index d6e359b..08f2154 100644
--- a/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
+++ b/shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java
@@ -83,7 +83,6 @@ public class RpcTypeEnumTest {
List<RpcTypeEnum> rpcTypeEnumList = RpcTypeEnum.acquireSupportMetadatas();
assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.DUBBO));
assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.GRPC));
- assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.HTTP));
assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.SPRING_CLOUD));
assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.SOFA));
assertTrue(rpcTypeEnumList.contains(RpcTypeEnum.TARS));
diff --git a/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandler.java
index 29ed4f3..901bb95 100644
--- a/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandler.java
@@ -31,7 +31,7 @@ import org.apache.shenyu.common.utils.Singleton;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
import org.apache.shenyu.plugin.apache.dubbo.cache.ApplicationConfigCache;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
@@ -46,9 +46,9 @@ import java.util.stream.Collectors;
*/
public class ApacheDubboPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, DubboRuleHandle>> RULE_CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, DubboRuleHandle>> RULE_CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
- public static final Supplier<RuleHandleCache<String, List<DubboSelectorHandle>>> SELECTOR_CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, List<DubboSelectorHandle>>> SELECTOR_CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerPlugin(final PluginData pluginData) {
diff --git a/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java b/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java
index 9871614..1653b7a 100644
--- a/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java
+++ b/shenyu-plugin/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java
@@ -90,14 +90,12 @@ public class ApacheDubboProxyService {
return ret;
})).onErrorMap(exception -> exception instanceof GenericException ? new ShenyuException(((GenericException) exception).getExceptionMessage()) : new ShenyuException(exception));
}
-
+
+ @SuppressWarnings("unchecked")
private CompletableFuture<Object> invokeAsync(final GenericService genericService, final String method, final String[] parameterTypes, final Object[] args) throws GenericException {
//Compatible with asynchronous calls of lower Dubbo versions
genericService.$invoke(method, parameterTypes, args);
Object resultFromFuture = RpcContext.getContext().getFuture();
- if (resultFromFuture instanceof CompletableFuture) {
- return (CompletableFuture<Object>) resultFromFuture;
- }
- return CompletableFuture.completedFuture(resultFromFuture);
+ return resultFromFuture instanceof CompletableFuture ? (CompletableFuture<Object>) resultFromFuture : CompletableFuture.completedFuture(resultFromFuture);
}
}
diff --git a/shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/RuleHandleCache.java b/shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/CommonHandleCache.java
similarity index 95%
rename from shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/RuleHandleCache.java
rename to shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/CommonHandleCache.java
index e7de363..81f0150 100644
--- a/shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/RuleHandleCache.java
+++ b/shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/cache/CommonHandleCache.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* The selector or rule handle base cache.
*/
-public class RuleHandleCache<K, V> implements HandleCache<K, V> {
+public class CommonHandleCache<K, V> implements HandleCache<K, V> {
/**
* selectorId.ruleName -> handle.
diff --git a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/RuleHandleCacheTest.java b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
similarity index 68%
rename from shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/RuleHandleCacheTest.java
rename to shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
index 233ce05..4257f35 100644
--- a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/RuleHandleCacheTest.java
+++ b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
@@ -26,46 +26,46 @@ import org.junit.Test;
/**
* BaseHandleCache test.
*/
-public class RuleHandleCacheTest {
+public class CommonHandleCacheTest {
private static final String MOCK_KEY = "mockKey";
private static final String MOCK_VALUE = "mockValue";
- private RuleHandleCache<String, String> ruleHandleCache;
+ private CommonHandleCache<String, String> commonHandleCache;
private ConcurrentHashMap<String, String> cachedMockMap;
@Before
public void setUp() throws NoSuchFieldException, IllegalAccessException {
- this.ruleHandleCache = new EmptyMockRuleHandleCache<>();
+ this.commonHandleCache = new EmptyMockCommonHandleCache<>();
this.cachedMockMap = new ConcurrentHashMap<>();
- Field field = this.ruleHandleCache.getClass().getSuperclass().getDeclaredField("cached");
+ Field field = this.commonHandleCache.getClass().getSuperclass().getDeclaredField("cached");
field.setAccessible(true);
- field.set(ruleHandleCache, cachedMockMap);
+ field.set(commonHandleCache, cachedMockMap);
}
@Test
public void obtainHandle() {
- assert null == ruleHandleCache.obtainHandle(MOCK_KEY);
+ assert null == commonHandleCache.obtainHandle(MOCK_KEY);
cachedMockMap.put(MOCK_KEY, MOCK_VALUE);
- assert MOCK_VALUE.equals(ruleHandleCache.obtainHandle(MOCK_KEY));
+ assert MOCK_VALUE.equals(commonHandleCache.obtainHandle(MOCK_KEY));
}
@Test
public void cachedHandle() {
- ruleHandleCache.cachedHandle(null, MOCK_VALUE);
+ commonHandleCache.cachedHandle(null, MOCK_VALUE);
assert cachedMockMap.size() == 0;
- ruleHandleCache.cachedHandle(MOCK_KEY, MOCK_VALUE);
- assert MOCK_VALUE.equals(ruleHandleCache.obtainHandle(MOCK_KEY));
+ commonHandleCache.cachedHandle(MOCK_KEY, MOCK_VALUE);
+ assert MOCK_VALUE.equals(commonHandleCache.obtainHandle(MOCK_KEY));
}
@Test
public void removeHandle() {
- ruleHandleCache.cachedHandle(MOCK_KEY, MOCK_VALUE);
+ commonHandleCache.cachedHandle(MOCK_KEY, MOCK_VALUE);
assert cachedMockMap.size() == 1;
- ruleHandleCache.removeHandle(MOCK_KEY);
+ commonHandleCache.removeHandle(MOCK_KEY);
assert cachedMockMap.size() == 0;
}
}
diff --git a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockRuleHandleCache.java b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockCommonHandleCache.java
similarity index 92%
rename from shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockRuleHandleCache.java
rename to shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockCommonHandleCache.java
index b4b080d..cbd16b5 100644
--- a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockRuleHandleCache.java
+++ b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/EmptyMockCommonHandleCache.java
@@ -21,6 +21,6 @@ package org.apache.shenyu.plugin.base.cache;
* BaseHandleCache empty mock subclass.
*/
-class EmptyMockRuleHandleCache<K, V> extends RuleHandleCache<K, V> {
+class EmptyMockCommonHandleCache<K, V> extends CommonHandleCache<K, V> {
}
diff --git a/shenyu-plugin/shenyu-plugin-context-path/src/main/java/org/apache/shenyu/plugin/context/path/handler/ContextPathPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-context-path/src/main/java/org/apache/shenyu/plugin/context/path/handler/ContextPathPluginDataHandler.java
index e48c492..1d4bbfb 100644
--- a/shenyu-plugin/shenyu-plugin-context-path/src/main/java/org/apache/shenyu/plugin/context/path/handler/ContextPathPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-context-path/src/main/java/org/apache/shenyu/plugin/context/path/handler/ContextPathPluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.impl.ContextMappingHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class ContextPathPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, ContextMappingHandle>> CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, ContextMappingHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorRequestPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorRequestPluginDataHandler.java
index 886d468..c5d2c19 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorRequestPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorRequestPluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.plugin.cryptor.dto.CryptorRuleHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class CryptorRequestPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, CryptorRuleHandle>> CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, CryptorRuleHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorResponsePluginDataHandler.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorResponsePluginDataHandler.java
index 301c516..f962435 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorResponsePluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/handler/CryptorResponsePluginDataHandler.java
@@ -18,10 +18,10 @@
package org.apache.shenyu.plugin.cryptor.handler;
import org.apache.shenyu.common.dto.RuleData;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.cryptor.dto.CryptorRuleHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class CryptorResponsePluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, CryptorRuleHandle>> CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, CryptorRuleHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
index 07ee318..6ea7ff0 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPlugin.java
@@ -98,7 +98,8 @@ public class CryptorRequestPlugin extends AbstractShenyuPlugin {
public String named() {
return PluginEnum.CRYPTOR_REQUEST.getName();
}
-
+
+ @SuppressWarnings("rawtypes")
private Mono strategyMatch(final CryptorRuleHandle ruleHandle, final String originalBody, final ServerWebExchange exchange) {
String parseBody = JsonUtil.parser(originalBody, ruleHandle.getFieldNames());
if (null == parseBody) {
@@ -112,5 +113,4 @@ public class CryptorRequestPlugin extends AbstractShenyuPlugin {
}
return HttpUtil.success(originalBody, modifiedBody, ruleHandle.getWay(), ruleHandle.getFieldNames());
}
-
}
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
index f0c9279..f88217e 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePlugin.java
@@ -95,7 +95,8 @@ public class CryptorResponsePlugin extends AbstractShenyuPlugin {
public String named() {
return PluginEnum.CRYPTOR_RESPONSE.getName();
}
-
+
+ @SuppressWarnings("rawtypes")
private Mono strategyMatch(final String originalBody, final CryptorRuleHandle ruleHandle, final ServerWebExchange exchange) {
String parseBody = JsonUtil.parser(originalBody, ruleHandle.getFieldNames());
if (parseBody == null) {
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/strategy/CryptorStrategyFactory.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/strategy/CryptorStrategyFactory.java
index b4c5dfa..a47ccd1 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/strategy/CryptorStrategyFactory.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/strategy/CryptorStrategyFactory.java
@@ -94,5 +94,4 @@ public class CryptorStrategyFactory {
return null;
}
}
-
}
diff --git a/shenyu-plugin/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandler.java b/shenyu-plugin/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandler.java
index bff9bd4..67c7486 100644
--- a/shenyu-plugin/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandler.java
@@ -26,7 +26,7 @@ import org.apache.shenyu.common.utils.CollectionUtils;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
*/
public class DividePluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, DivideRuleHandle>> CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, DivideRuleHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerSelector(final SelectorData selectorData) {
diff --git a/shenyu-plugin/shenyu-plugin-hystrix/src/main/java/org/apache/shenyu/plugin/hystrix/handler/HystrixPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-hystrix/src/main/java/org/apache/shenyu/plugin/hystrix/handler/HystrixPluginDataHandler.java
index b43fa8b..bd90f50 100644
--- a/shenyu-plugin/shenyu-plugin-hystrix/src/main/java/org/apache/shenyu/plugin/hystrix/handler/HystrixPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-hystrix/src/main/java/org/apache/shenyu/plugin/hystrix/handler/HystrixPluginDataHandler.java
@@ -22,7 +22,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.HystrixHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -35,20 +35,20 @@ import java.util.function.Supplier;
*/
public class HystrixPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, HystrixHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, HystrixHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
HystrixPropertiesFactory.reset();
- Optional.ofNullable(ruleData.getHandle()).ifPresent(s -> {
- final HystrixHandle hystrixHandle = GsonUtils.getInstance().fromJson(s, HystrixHandle.class);
+ Optional.ofNullable(ruleData.getHandle()).ifPresent(rule -> {
+ HystrixHandle hystrixHandle = GsonUtils.getInstance().fromJson(rule, HystrixHandle.class);
CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(ruleData), hystrixHandle);
});
}
@Override
public void removeRule(final RuleData ruleData) {
- Optional.ofNullable(ruleData.getHandle()).ifPresent(s -> CACHED_HANDLE.get().removeHandle(CacheKeyUtils.INST.getKey(ruleData)));
+ Optional.ofNullable(ruleData.getHandle()).ifPresent(rule -> CACHED_HANDLE.get().removeHandle(CacheKeyUtils.INST.getKey(ruleData)));
}
@Override
diff --git a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCache.java b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCache.java
similarity index 77%
rename from shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCache.java
rename to shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCache.java
index 505ffca..f02a52e 100644
--- a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCache.java
+++ b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCache.java
@@ -18,15 +18,15 @@
package org.apache.shenyu.plugin.modify.response.cache;
import org.apache.shenyu.common.dto.convert.rule.impl.ModifyResponseRuleHandle;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
/**
* The rule handle cache.
*/
@SuppressWarnings("all")
-public final class ModifyResponseRuleHandleCache extends RuleHandleCache<String, ModifyResponseRuleHandle> {
+public final class ModifyResponseCommonHandleCache extends CommonHandleCache<String, ModifyResponseRuleHandle> {
- private ModifyResponseRuleHandleCache() {
+ private ModifyResponseCommonHandleCache() {
}
/**
@@ -34,7 +34,7 @@ public final class ModifyResponseRuleHandleCache extends RuleHandleCache<String,
*
* @return the instance
*/
- public static ModifyResponseRuleHandleCache getInstance() {
+ public static ModifyResponseCommonHandleCache getInstance() {
return ModifyResponseRuleHandleCacheInstance.INSTANCE;
}
@@ -45,6 +45,6 @@ public final class ModifyResponseRuleHandleCache extends RuleHandleCache<String,
/**
* The Instance.
*/
- static final ModifyResponseRuleHandleCache INSTANCE = new ModifyResponseRuleHandleCache();
+ static final ModifyResponseCommonHandleCache INSTANCE = new ModifyResponseCommonHandleCache();
}
}
diff --git a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/handler/ModifyResponsePluginDataHandler.java b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/handler/ModifyResponsePluginDataHandler.java
index abb52fe..b93a6d1 100644
--- a/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/handler/ModifyResponsePluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-modify-response/src/main/java/org/apache/shenyu/plugin/modify/response/handler/ModifyResponsePluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.impl.ModifyResponseRuleHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class ModifyResponsePluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, ModifyResponseRuleHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, ModifyResponseRuleHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCacheTest.java b/shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCacheTest.java
similarity index 83%
rename from shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCacheTest.java
rename to shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCacheTest.java
index 3b73833..f4a651f 100644
--- a/shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseRuleHandleCacheTest.java
+++ b/shenyu-plugin/shenyu-plugin-modify-response/src/test/java/org/apache/shenyu/plugin/modify/response/cache/ModifyResponseCommonHandleCacheTest.java
@@ -21,13 +21,13 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * The Test Case For ModifyResponseRuleHandleCache.
+ * The Test Case For ModifyResponseCommonHandleCache.
*/
-public final class ModifyResponseRuleHandleCacheTest {
+public final class ModifyResponseCommonHandleCacheTest {
@Test
public void testGetOrder() {
- Assert.assertNotNull(ModifyResponseRuleHandleCache.getInstance());
+ Assert.assertNotNull(ModifyResponseCommonHandleCache.getInstance());
}
}
diff --git a/shenyu-plugin/shenyu-plugin-param-mapping/src/main/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-param-mapping/src/main/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataHandler.java
index f2be01d..bb4205f 100644
--- a/shenyu-plugin/shenyu-plugin-param-mapping/src/main/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-param-mapping/src/main/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.impl.ParamMappingHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class ParamMappingPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, ParamMappingHandle>> CACHED_HANDLE = new BeanHolder(() -> new RuleHandleCache());
+ public static final Supplier<CommonHandleCache<String, ParamMappingHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-param-mapping/src/test/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataTest.java b/shenyu-plugin/shenyu-plugin-param-mapping/src/test/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataTest.java
index 5935a0e..b2e0078 100644
--- a/shenyu-plugin/shenyu-plugin-param-mapping/src/test/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataTest.java
+++ b/shenyu-plugin/shenyu-plugin-param-mapping/src/test/java/org/apache/shenyu/plugin/param/mapping/handler/ParamMappingPluginDataTest.java
@@ -24,9 +24,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import static junit.framework.Assert.assertNull;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertNull;
/**
* Test case for {@link ParamMappingPluginDataHandler}.
@@ -64,7 +64,7 @@ public class ParamMappingPluginDataTest {
this.paramMappingPluginDataHandler.removeRule(this.ruleData);
assertNull(ParamMappingPluginDataHandler.CACHED_HANDLE.get().obtainHandle(CacheKeyUtils.INST.getKey(this.ruleData)));
this.paramMappingPluginDataHandler.removeRule(ruleData);
- assertNull(paramMappingPluginDataHandler.CACHED_HANDLE.get().obtainHandle(CacheKeyUtils.INST.getKey(ruleData)));
+ assertNull(ParamMappingPluginDataHandler.CACHED_HANDLE.get().obtainHandle(CacheKeyUtils.INST.getKey(ruleData)));
}
@Test
diff --git a/shenyu-plugin/shenyu-plugin-ratelimiter/src/main/java/org/apache/shenyu/plugin/ratelimiter/handler/RateLimiterPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-ratelimiter/src/main/java/org/apache/shenyu/plugin/ratelimiter/handler/RateLimiterPluginDataHandler.java
index 7f2a045..ab8acfa 100644
--- a/shenyu-plugin/shenyu-plugin-ratelimiter/src/main/java/org/apache/shenyu/plugin/ratelimiter/handler/RateLimiterPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-ratelimiter/src/main/java/org/apache/shenyu/plugin/ratelimiter/handler/RateLimiterPluginDataHandler.java
@@ -26,7 +26,7 @@ import org.apache.shenyu.common.dto.convert.rule.RateLimiterHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.enums.RedisModeEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -58,7 +58,7 @@ import java.util.function.Supplier;
*/
public class RateLimiterPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, RateLimiterHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, RateLimiterHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerPlugin(final PluginData pluginData) {
diff --git a/shenyu-plugin/shenyu-plugin-redirect/src/main/java/org/apache/shenyu/plugin/redirect/handler/RedirectPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-redirect/src/main/java/org/apache/shenyu/plugin/redirect/handler/RedirectPluginDataHandler.java
index 2d2094f..9c0dc32 100644
--- a/shenyu-plugin/shenyu-plugin-redirect/src/main/java/org/apache/shenyu/plugin/redirect/handler/RedirectPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-redirect/src/main/java/org/apache/shenyu/plugin/redirect/handler/RedirectPluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.RedirectHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class RedirectPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, RedirectHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, RedirectHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-request/src/main/java/org/apache/shenyu/plugin/request/handler/RequestPluginHandler.java b/shenyu-plugin/shenyu-plugin-request/src/main/java/org/apache/shenyu/plugin/request/handler/RequestPluginHandler.java
index a6d2678..6378135 100644
--- a/shenyu-plugin/shenyu-plugin-request/src/main/java/org/apache/shenyu/plugin/request/handler/RequestPluginHandler.java
+++ b/shenyu-plugin/shenyu-plugin-request/src/main/java/org/apache/shenyu/plugin/request/handler/RequestPluginHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.RequestHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class RequestPluginHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, RequestHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, RequestHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-resilience4j/src/main/java/org/apache/shenyu/plugin/resilience4j/handler/Resilience4JHandler.java b/shenyu-plugin/shenyu-plugin-resilience4j/src/main/java/org/apache/shenyu/plugin/resilience4j/handler/Resilience4JHandler.java
index dbf10b6..e0188d8 100644
--- a/shenyu-plugin/shenyu-plugin-resilience4j/src/main/java/org/apache/shenyu/plugin/resilience4j/handler/Resilience4JHandler.java
+++ b/shenyu-plugin/shenyu-plugin-resilience4j/src/main/java/org/apache/shenyu/plugin/resilience4j/handler/Resilience4JHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.Resilience4JHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -35,7 +35,7 @@ import java.util.function.Supplier;
*/
public class Resilience4JHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, Resilience4JHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, Resilience4JHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-rewrite/src/main/java/org/apache/shenyu/plugin/rewrite/handler/RewritePluginDataHandler.java b/shenyu-plugin/shenyu-plugin-rewrite/src/main/java/org/apache/shenyu/plugin/rewrite/handler/RewritePluginDataHandler.java
index 5529706..1dd8d9c 100644
--- a/shenyu-plugin/shenyu-plugin-rewrite/src/main/java/org/apache/shenyu/plugin/rewrite/handler/RewritePluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-rewrite/src/main/java/org/apache/shenyu/plugin/rewrite/handler/RewritePluginDataHandler.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.RewriteHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -34,7 +34,7 @@ import java.util.function.Supplier;
*/
public class RewritePluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, RewriteHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, RewriteHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerRule(final RuleData ruleData) {
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java
index 7ef0789..38eb399 100644
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java
+++ b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java
@@ -32,14 +32,12 @@ import org.apache.shenyu.plugin.api.result.ShenyuResultWrap;
import org.apache.shenyu.plugin.api.utils.WebFluxResultUtils;
import org.apache.shenyu.plugin.base.AbstractShenyuPlugin;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudRuleHandleCache;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudSelectorHandleCache;
+import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler;
import org.apache.shenyu.plugin.springcloud.loadbalance.LoadBalanceKey;
import org.apache.shenyu.plugin.springcloud.loadbalance.LoadBalanceKeyHolder;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.web.server.ServerWebExchange;
-
import reactor.core.publisher.Mono;
import java.net.URI;
@@ -69,8 +67,8 @@ public class SpringCloudPlugin extends AbstractShenyuPlugin {
}
final ShenyuContext shenyuContext = exchange.getAttribute(Constants.CONTEXT);
assert shenyuContext != null;
- final SpringCloudSelectorHandle springCloudSelectorHandle = SpringCloudSelectorHandleCache.getInstance().obtainHandle(selector.getId());
- final SpringCloudRuleHandle ruleHandle = SpringCloudRuleHandleCache.getInstance().obtainHandle(CacheKeyUtils.INST.getKey(rule));
+ final SpringCloudSelectorHandle springCloudSelectorHandle = SpringCloudPluginDataHandler.SELECTOR_CACHED.get().obtainHandle(selector.getId());
+ final SpringCloudRuleHandle ruleHandle = SpringCloudPluginDataHandler.RULE_CACHED.get().obtainHandle(CacheKeyUtils.INST.getKey(rule));
String serviceId = springCloudSelectorHandle.getServiceId();
if (StringUtils.isBlank(serviceId) || StringUtils.isBlank(ruleHandle.getPath())) {
Object error = ShenyuResultWrap.error(ShenyuResultEnum.CANNOT_CONFIG_SPRINGCLOUD_SERVICEID.getCode(),
@@ -79,7 +77,7 @@ public class SpringCloudPlugin extends AbstractShenyuPlugin {
}
String ip = Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress();
LoadBalanceKey loadBalanceKey = new LoadBalanceKey(ip, selector.getId(), ruleHandle.getLoadBalance());
- ServiceInstance serviceInstance = null;
+ ServiceInstance serviceInstance;
try {
LoadBalanceKeyHolder.setLoadBalanceKey(loadBalanceKey);
serviceInstance = loadBalancer.choose(serviceId);
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudRuleHandleCache.java b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudRuleHandleCache.java
deleted file mode 100644
index 9b98682..0000000
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudRuleHandleCache.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.springcloud.cache;
-
-import org.apache.shenyu.common.dto.convert.rule.impl.SpringCloudRuleHandle;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
-
-/**
- * The rule handle cache.
- */
-public final class SpringCloudRuleHandleCache extends RuleHandleCache<String, SpringCloudRuleHandle> {
-
- private SpringCloudRuleHandleCache() {
- }
-
- /**
- * Gets instance.
- *
- * @return the instance
- */
- public static SpringCloudRuleHandleCache getInstance() {
- return SpringCloudRuleHandleCacheInstance.INSTANCE;
- }
-
- /**
- * The type rule handle cache instance.
- */
- static class SpringCloudRuleHandleCacheInstance {
- /**
- * The Instance.
- */
- static final SpringCloudRuleHandleCache INSTANCE = new SpringCloudRuleHandleCache();
- }
-}
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudSelectorHandleCache.java b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudSelectorHandleCache.java
deleted file mode 100644
index 69a664e..0000000
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/cache/SpringCloudSelectorHandleCache.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.springcloud.cache;
-
-import org.apache.shenyu.common.dto.convert.selector.SpringCloudSelectorHandle;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
-
-/**
- * The spring cloud selector handle cache.
- */
-public final class SpringCloudSelectorHandleCache extends RuleHandleCache<String, SpringCloudSelectorHandle> {
-
- private SpringCloudSelectorHandleCache() {
- }
-
- /**
- * Gets instance.
- *
- * @return the instance
- */
- public static SpringCloudSelectorHandleCache getInstance() {
- return SpringCloudSelectorHandleCacheInstance.INSTANCE;
- }
-
- /**
- * The type selector handle cache instance.
- */
- static class SpringCloudSelectorHandleCacheInstance {
- /**
- * The Instance.
- */
- static final SpringCloudSelectorHandleCache INSTANCE = new SpringCloudSelectorHandleCache();
- }
-}
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java
index 4de5e15..e1b0ddd 100644
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java
@@ -19,32 +19,37 @@ package org.apache.shenyu.plugin.springcloud.handler;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.dto.convert.rule.impl.SpringCloudRuleHandle;
+import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.dto.convert.selector.SpringCloudSelectorHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.CollectionUtils;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
+import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudRuleHandleCache;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudSelectorHandleCache;
import java.util.List;
import java.util.Optional;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
* The type spring cloud plugin data handler.
*/
public class SpringCloudPluginDataHandler implements PluginDataHandler {
-
+
+ public static final Supplier<CommonHandleCache<String, SpringCloudSelectorHandle>> SELECTOR_CACHED = new BeanHolder<>(CommonHandleCache::new);
+
+ public static final Supplier<CommonHandleCache<String, SpringCloudRuleHandle>> RULE_CACHED = new BeanHolder<>(CommonHandleCache::new);
+
@Override
public void handlerSelector(final SelectorData selectorData) {
SpringCloudSelectorHandle springCloudSelectorHandle = GsonUtils.getInstance().fromJson(selectorData.getHandle(), SpringCloudSelectorHandle.class);
- SpringCloudSelectorHandleCache.getInstance().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
+ SELECTOR_CACHED.get().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
if (CollectionUtils.isEmpty(springCloudSelectorHandle.getDivideUpstreams())) {
UpstreamCacheManager.getInstance().removeByKey(selectorData.getId());
return;
@@ -54,7 +59,7 @@ public class SpringCloudPluginDataHandler implements PluginDataHandler {
@Override
public void removeSelector(final SelectorData selectorData) {
- SpringCloudSelectorHandleCache.getInstance().removeHandle(selectorData.getId());
+ SELECTOR_CACHED.get().removeHandle(selectorData.getId());
UpstreamCacheManager.getInstance().removeByKey(selectorData.getId());
}
@@ -62,13 +67,13 @@ public class SpringCloudPluginDataHandler implements PluginDataHandler {
public void handlerRule(final RuleData ruleData) {
Optional.ofNullable(ruleData.getHandle()).ifPresent(s -> {
SpringCloudRuleHandle springCloudRuleHandle = GsonUtils.getInstance().fromJson(s, SpringCloudRuleHandle.class);
- SpringCloudRuleHandleCache.getInstance().cachedHandle(CacheKeyUtils.INST.getKey(ruleData), springCloudRuleHandle);
+ RULE_CACHED.get().cachedHandle(CacheKeyUtils.INST.getKey(ruleData), springCloudRuleHandle);
});
}
@Override
public void removeRule(final RuleData ruleData) {
- Optional.ofNullable(ruleData.getHandle()).ifPresent(s -> SpringCloudRuleHandleCache.getInstance().removeHandle(CacheKeyUtils.INST.getKey(ruleData)));
+ Optional.ofNullable(ruleData.getHandle()).ifPresent(s -> RULE_CACHED.get().removeHandle(CacheKeyUtils.INST.getKey(ruleData)));
}
@Override
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/loadbalance/LoadBalanceRule.java b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/loadbalance/LoadBalanceRule.java
index 37e5531..5c5e9dc 100644
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/loadbalance/LoadBalanceRule.java
+++ b/shenyu-plugin/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/loadbalance/LoadBalanceRule.java
@@ -24,11 +24,10 @@ import org.apache.shenyu.common.utils.CollectionUtils;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
import org.apache.shenyu.loadbalancer.factory.LoadBalancerFactory;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudSelectorHandleCache;
+import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler;
import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
/**
* The spring cloud loadbalancer rule.
@@ -42,7 +41,7 @@ public class LoadBalanceRule extends ZoneAvoidanceRule {
if (CollectionUtils.isEmpty(available)) {
return null;
}
- final SpringCloudSelectorHandle springCloudSelectorHandle = SpringCloudSelectorHandleCache.getInstance().obtainHandle(loadBalanceKey.getSelectorId());
+ final SpringCloudSelectorHandle springCloudSelectorHandle = SpringCloudPluginDataHandler.SELECTOR_CACHED.get().obtainHandle(loadBalanceKey.getSelectorId());
if (!springCloudSelectorHandle.getGray()) {
return super.choose(key);
}
@@ -53,13 +52,10 @@ public class LoadBalanceRule extends ZoneAvoidanceRule {
//select server from available to choose
final List<Upstream> choose = new ArrayList<>(available.size());
for (Server server : available) {
- Optional<Upstream> divideUpstream = Optional.ofNullable(divideUpstreams.stream()
+ divideUpstreams.stream()
.filter(Upstream::isStatus)
.filter(upstream -> upstream.getUrl().equals(server.getHostPort()))
- .findFirst()).orElse(Optional.empty());
- if (divideUpstream.isPresent()) {
- choose.add(divideUpstream.get());
- }
+ .findFirst().ifPresent(choose::add);
}
if (CollectionUtils.isEmpty(choose)) {
return super.choose(key);
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java b/shenyu-plugin/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java
index be4ae1b..38f9c7c 100644
--- a/shenyu-plugin/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java
+++ b/shenyu-plugin/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java
@@ -21,8 +21,8 @@ import com.google.common.collect.Lists;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.dto.convert.rule.impl.SpringCloudRuleHandle;
+import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.dto.convert.selector.SpringCloudSelectorHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.enums.RpcTypeEnum;
@@ -33,8 +33,7 @@ import org.apache.shenyu.plugin.api.result.DefaultShenyuResult;
import org.apache.shenyu.plugin.api.result.ShenyuResult;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudRuleHandleCache;
-import org.apache.shenyu.plugin.springcloud.cache.SpringCloudSelectorHandleCache;
+import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -108,7 +107,7 @@ public class SpringCloudPluginTest {
final SelectorData selectorData = SelectorData.builder()
.handle(GsonUtils.getInstance().toJson(springCloudSelectorHandle))
.build();
- SpringCloudSelectorHandleCache.getInstance().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
+ SpringCloudPluginDataHandler.SELECTOR_CACHED.get().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, null)).expectSubscription().verifyComplete();
final SpringCloudRuleHandle springCloudRuleHandle = new SpringCloudRuleHandle();
springCloudRuleHandle.setPath("/springcloud");
@@ -116,7 +115,7 @@ public class SpringCloudPluginTest {
final RuleData rule = RuleData.builder()
.handle(GsonUtils.getInstance().toJson(springCloudRuleHandle))
.build();
- SpringCloudRuleHandleCache.getInstance().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
+ SpringCloudPluginDataHandler.RULE_CACHED.get().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
ShenyuContext shenyuContext = new ShenyuContext();
shenyuContext.setRealUrl("http://localhost/test");
shenyuContext.setHttpMethod(HttpMethod.GET.name());
@@ -161,9 +160,9 @@ public class SpringCloudPluginTest {
.build();
SpringCloudSelectorHandle springCloudSelectorHandle = new SpringCloudSelectorHandle();
- SpringCloudSelectorHandleCache.getInstance().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
+ SpringCloudPluginDataHandler.SELECTOR_CACHED.get().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
SpringCloudRuleHandle springCloudRuleHandle = GsonUtils.getGson().fromJson(rule.getHandle(), SpringCloudRuleHandle.class);
- SpringCloudRuleHandleCache.getInstance().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
+ SpringCloudPluginDataHandler.RULE_CACHED.get().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
Mono<Void> execute = springCloudPlugin.doExecute(exchange, chain, selectorData, rule);
StepVerifier.create(execute).expectSubscription().verifyComplete();
}
@@ -187,9 +186,9 @@ public class SpringCloudPluginTest {
.selectorId("springcloud")
.handle("{\"path\":\"service/\"}")
.build();
- SpringCloudSelectorHandleCache.getInstance().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
+ SpringCloudPluginDataHandler.SELECTOR_CACHED.get().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
SpringCloudRuleHandle springCloudRuleHandle = GsonUtils.getGson().fromJson(rule.getHandle(), SpringCloudRuleHandle.class);
- SpringCloudRuleHandleCache.getInstance().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
+ SpringCloudPluginDataHandler.RULE_CACHED.get().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
Mono<Void> execute = springCloudPlugin.doExecute(exchange, chain, selectorData, rule);
StepVerifier.create(execute).expectSubscription().verifyComplete();
}
@@ -209,8 +208,8 @@ public class SpringCloudPluginTest {
.fromJson(selectorData.getHandle(), SpringCloudSelectorHandle.class);
SpringCloudRuleHandle springCloudRuleHandle = GsonUtils.getGson()
.fromJson(rule.getHandle(), SpringCloudRuleHandle.class);
- SpringCloudSelectorHandleCache.getInstance().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
- SpringCloudRuleHandleCache.getInstance().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
+ SpringCloudPluginDataHandler.SELECTOR_CACHED.get().cachedHandle(selectorData.getId(), springCloudSelectorHandle);
+ SpringCloudPluginDataHandler.RULE_CACHED.get().cachedHandle(CacheKeyUtils.INST.getKey(rule), springCloudRuleHandle);
exchange.getAttributes().put(Constants.CONTEXT, shenyuContext);
Mono<Void> execute = springCloudPlugin.doExecute(exchange, chain, selectorData, rule);
StepVerifier.create(execute).expectSubscription().verifyComplete();
diff --git a/shenyu-plugin/shenyu-plugin-waf/src/main/java/org/apache/shenyu/plugin/waf/handler/WafPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-waf/src/main/java/org/apache/shenyu/plugin/waf/handler/WafPluginDataHandler.java
index 6436538..6f67a2d 100644
--- a/shenyu-plugin/shenyu-plugin-waf/src/main/java/org/apache/shenyu/plugin/waf/handler/WafPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-waf/src/main/java/org/apache/shenyu/plugin/waf/handler/WafPluginDataHandler.java
@@ -22,7 +22,7 @@ import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.convert.rule.WafHandle;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -37,7 +37,7 @@ import java.util.function.Supplier;
*/
public class WafPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, WafHandle>> CACHED_HANDLE = new BeanHolder(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, WafHandle>> CACHED_HANDLE = new BeanHolder(CommonHandleCache::new);
@Override
public void handlerPlugin(final PluginData pluginData) {
diff --git a/shenyu-plugin/shenyu-plugin-websocket/src/main/java/org/apache/shenyu/plugin/websocket/handler/WebSocketPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-websocket/src/main/java/org/apache/shenyu/plugin/websocket/handler/WebSocketPluginDataHandler.java
index 24dfc9e..178951f 100644
--- a/shenyu-plugin/shenyu-plugin-websocket/src/main/java/org/apache/shenyu/plugin/websocket/handler/WebSocketPluginDataHandler.java
+++ b/shenyu-plugin/shenyu-plugin-websocket/src/main/java/org/apache/shenyu/plugin/websocket/handler/WebSocketPluginDataHandler.java
@@ -26,7 +26,7 @@ import org.apache.shenyu.common.utils.CollectionUtils;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.apache.shenyu.plugin.base.cache.RuleHandleCache;
+import org.apache.shenyu.plugin.base.cache.CommonHandleCache;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.base.utils.BeanHolder;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
*/
public class WebSocketPluginDataHandler implements PluginDataHandler {
- public static final Supplier<RuleHandleCache<String, WebSocketRuleHandle>> CACHED_HANDLE = new BeanHolder<>(RuleHandleCache::new);
+ public static final Supplier<CommonHandleCache<String, WebSocketRuleHandle>> CACHED_HANDLE = new BeanHolder<>(CommonHandleCache::new);
@Override
public void handlerSelector(final SelectorData selectorData) {
diff --git a/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/main/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepository.java b/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/main/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepository.java
index 6cffe2a..d588cee 100644
--- a/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/main/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepository.java
+++ b/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/main/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepository.java
@@ -111,7 +111,6 @@ public class NacosServerRegisterRepository implements ShenyuServerRegisterReposi
private void subscribeRpcTypeService(final RpcTypeEnum rpcType) {
final String serviceName = RegisterPathConstants.buildServiceInstancePath(rpcType.getName());
-
try {
Map<String, List<URIRegisterDTO>> services = new HashMap<>();
List<Instance> healthyInstances = namingService.selectInstances(serviceName, true);
@@ -125,11 +124,9 @@ public class NacosServerRegisterRepository implements ShenyuServerRegisterReposi
services.computeIfAbsent(contextPath, k -> new ArrayList<>()).add(uriRegisterDTO);
uriServiceCache.computeIfAbsent(serviceName, k -> new ConcurrentSkipListSet<>()).add(contextPath);
});
-
if (RPC_URI_TYPE_SET.contains(rpcType)) {
services.values().forEach(this::publishRegisterURI);
}
-
LOGGER.info("subscribe uri : {}", serviceName);
namingService.subscribe(serviceName, event -> {
if (event instanceof NamingEvent) {
@@ -148,7 +145,6 @@ public class NacosServerRegisterRepository implements ShenyuServerRegisterReposi
private void subscribeMetadata(final String serviceConfigName) {
registerMetadata(readData(serviceConfigName));
-
LOGGER.info("subscribe metadata: {}", serviceConfigName);
try {
configService.addListener(serviceConfigName, defaultGroup, new Listener() {
@@ -186,7 +182,6 @@ public class NacosServerRegisterRepository implements ShenyuServerRegisterReposi
private void registerURI(final String contextPath, final String serviceName, final RpcTypeEnum rpcType) {
try {
List<Instance> healthyInstances = namingService.selectInstances(serviceName, true);
-
List<URIRegisterDTO> registerDTOList = new ArrayList<>();
healthyInstances.forEach(healthyInstance -> {
if (contextPath.equals(healthyInstance.getMetadata().get("contextPath"))) {
@@ -201,7 +196,6 @@ public class NacosServerRegisterRepository implements ShenyuServerRegisterReposi
}
}
});
-
if (!RPC_URI_TYPE_SET.contains(rpcType)) {
return;
}
diff --git a/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/test/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepositoryTest.java b/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/test/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepositoryTest.java
index 17c8289..d814b7d 100644
--- a/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/test/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepositoryTest.java
+++ b/shenyu-register-center/shenyu-register-server/shenyu-register-server-nacos/src/test/java/org/apache/shenyu/register/server/nacos/NacosServerRegisterRepositoryTest.java
@@ -169,14 +169,14 @@ public class NacosServerRegisterRepositoryTest {
Method method = clazz.getDeclaredMethod(methodString, RpcTypeEnum.class);
method.setAccessible(true);
method.invoke(repository, RpcTypeEnum.DUBBO);
- verify(publisher, times(1)).publish(any());
+ verify(publisher, times(2)).publish(any());
List<String> list = new ArrayList<>();
list.add(GsonUtils.getInstance().toJson(MetaDataRegisterDTO.builder().build()));
configListener.receiveConfigInfo(GsonUtils.getInstance().toJson(list));
- verify(publisher, times(2)).publish(any());
+ verify(publisher, times(3)).publish(any());
eventListener.onEvent(mockEvent());
- verify(publisher, times(2)).publish(any());
+ verify(publisher, times(4)).publish(any());
}
}
diff --git a/shenyu-register-center/shenyu-register-server/shenyu-register-server-zookeeper/src/test/java/org/apache/shenyu/register/server/zookeeper/ZookeeperServerRegisterRepositoryTest.java b/shenyu-register-center/shenyu-register-server/shenyu-register-server-zookeeper/src/test/java/org/apache/shenyu/register/server/zookeeper/ZookeeperServerRegisterRepositoryTest.java
index 338e7e5..2c9a253 100644
--- a/shenyu-register-center/shenyu-register-server/shenyu-register-server-zookeeper/src/test/java/org/apache/shenyu/register/server/zookeeper/ZookeeperServerRegisterRepositoryTest.java
+++ b/shenyu-register-center/shenyu-register-server/shenyu-register-server-zookeeper/src/test/java/org/apache/shenyu/register/server/zookeeper/ZookeeperServerRegisterRepositoryTest.java
@@ -23,7 +23,6 @@ import org.I0Itec.zkclient.ZkClient;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.register.common.dto.MetaDataRegisterDTO;
import org.apache.shenyu.register.server.api.ShenyuServerRegisterPublisher;
-import org.apache.shenyu.register.server.api.ShenyuServerRegisterRepository;
import org.junit.Before;
import org.junit.Test;
@@ -33,19 +32,19 @@ import java.util.Arrays;
import java.util.Collections;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
/**
* Test for Zookeeper register center.
*/
-public class ZookeeperServerRegisterRepositoryTest implements ShenyuServerRegisterRepository {
+public class ZookeeperServerRegisterRepositoryTest {
private ZookeeperServerRegisterRepository repository;