Aias00 commented on code in PR #6231:
URL: https://github.com/apache/shenyu/pull/6231#discussion_r2693214553
##########
shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/AbstractShenyuPlugin.java:
##########
@@ -92,71 +96,56 @@ public abstract class AbstractShenyuPlugin implements
ShenyuPlugin {
public Mono<Void> execute(final ServerWebExchange exchange, final
ShenyuPluginChain chain) {
initCacheConfig();
final String pluginName = named();
- PluginData pluginData =
BaseDataCache.getInstance().obtainPluginData(pluginName);
- // early exit
- if (Objects.isNull(pluginData) || !pluginData.getEnabled()) {
- return chain.execute(exchange);
- }
final String path = getRawPath(exchange);
- List<SelectorData> selectors =
BaseDataCache.getInstance().obtainSelectorData(pluginName);
- if (CollectionUtils.isEmpty(selectors)) {
- return handleSelectorIfNull(pluginName, exchange, chain);
+
+ PluginDataDecisionMaker pluginDataDecisionMaker = new
PluginDataDecisionMaker();
+ List<PluginData> pluginDataList =
pluginDataDecisionMaker.getData(pluginName);
+ if (CollectionUtils.isEmpty(pluginDataList) ||
!pluginDataDecisionMaker.shouldContinue(pluginDataList.get(0))) {
+ return pluginDataDecisionMaker.handleEmpty(pluginName, exchange,
chain);
}
- SelectorData selectorData = obtainSelectorDataCacheIfEnabled(path);
- // handle Selector
- if (Objects.nonNull(selectorData) &&
StringUtils.isBlank(selectorData.getId())) {
- return handleSelectorIfNull(pluginName, exchange, chain);
+
+ SelectorDataDecisionMaker selectorDataDecisionMaker = new
SelectorDataDecisionMaker();
+ List<SelectorData> selectorDataList =
selectorDataDecisionMaker.getData(pluginName);
+ if (CollectionUtils.isEmpty(selectorDataList)) {
+ return selectorDataDecisionMaker.handleEmpty(pluginName, exchange,
chain);
}
- if (Objects.isNull(selectorData)) {
- selectorData = trieMatchSelector(exchange, pluginName, path);
- if (Objects.isNull(selectorData)) {
- selectorData = defaultMatchSelector(exchange, selectors, path);
- if (Objects.isNull(selectorData)) {
- return handleSelectorIfNull(pluginName, exchange, chain);
- }
- }
+
+ SelectorData selectorData =
selectorDataDecisionMaker.matchData(exchange, selectorDataList, path);
+ if (selectorData == null) {
+ return selectorDataDecisionMaker.handleEmpty(pluginName, exchange,
chain);
}
+
printLog(selectorData, pluginName);
- if (!selectorData.getContinued()) {
- // if continued， not match rules
+ if (!selectorDataDecisionMaker.shouldContinue(selectorData)) {
Review Comment:
@gumaomao pls check this
##########
shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/provider/PluginDataProvider.java:
##########
@@ -0,0 +1,15 @@
+package org.apache.shenyu.plugin.base.provider;
+
+import org.apache.shenyu.common.dto.PluginData;
+import org.apache.shenyu.plugin.base.cache.BaseDataCache;
+
+import java.util.Collections;
+import java.util.List;
+
+public class PluginDataProvider implements DataProvider<PluginData> {
+ @Override
+ public List<PluginData> getData(String pluginName) {
+ PluginData data =
BaseDataCache.getInstance().obtainPluginData(pluginName);
+ return data != null ? Collections.singletonList(data) :
Collections.emptyList();
+ }
+}
Review Comment:
@gumaomao pls check this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
