fix: 修复剩余69个CI提示的代码风格错误问题

Author: gumaomao

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/AbstractShenyuPlugin.java

@@ -33,6 +33,7 @@
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * abstract shenyu plugin please extends.
@@ -71,7 +72,6 @@ public Mono<Void> execute(final ServerWebExchange exchange, final ShenyuPluginCh
         final String pluginName = named();
         final String path = getRawPath(exchange);
 
-
         List<PluginData> pluginDataList = pluginDataDecisionMaker.getData(pluginName);
         if (CollectionUtils.isEmpty(pluginDataList) || !pluginDataDecisionMaker.shouldContinue(pluginDataList.get(0))) {
             return pluginDataDecisionMaker.handleEmpty(pluginName, exchange, chain);
@@ -82,8 +82,8 @@ public Mono<Void> execute(final ServerWebExchange exchange, final ShenyuPluginCh
             return selectorDataDecisionMaker.handleEmpty(pluginName, exchange, chain);
         }
 
-        SelectorData selectorData = selectorDataDecisionMaker.matchData(exchange,pluginName, selectorDataList, path, null);
-        if (selectorData == null) {
+        SelectorData selectorData = selectorDataDecisionMaker.matchData(exchange, pluginName, selectorDataList, path, null);
+        if (Objects.isNull(selectorData)) {
             return selectorDataDecisionMaker.handleEmpty(pluginName, exchange, chain);
         }
 
@@ -92,8 +92,6 @@ public Mono<Void> execute(final ServerWebExchange exchange, final ShenyuPluginCh
             return doExecute(exchange, chain, selectorData, defaultRuleData(selectorData));
         }
 
-
-
         List<RuleData> ruleDataList = ruleDataDecisionMaker.getData(selectorData.getId());
         if (CollectionUtils.isEmpty(ruleDataList)) {
             return ruleDataDecisionMaker.handleEmpty(pluginName, exchange, chain);
@@ -105,8 +103,8 @@ public Mono<Void> execute(final ServerWebExchange exchange, final ShenyuPluginCh
             return doExecute(exchange, chain, selectorData, rule);
         }
 
-        RuleData ruleData = ruleDataDecisionMaker.matchData(exchange,named(), ruleDataList, path, selectorData);
-        if (ruleData == null) {
+        RuleData ruleData = ruleDataDecisionMaker.matchData(exchange, named(), ruleDataList, path, selectorData);
+        if (Objects.isNull(ruleData)) {
             return ruleDataDecisionMaker.handleEmpty(pluginName, exchange, chain);
         }
 

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/maker/AbstractMatchDecisionMaker.java

@@ -1,3 +1,20 @@
+/*
+ * 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.base.maker;
 
 import org.apache.shenyu.common.dto.BaseData;
@@ -10,6 +27,7 @@
 
 /**
  * Abstract base class for making match decisions in plugins using the Template Method pattern.
+ *
  * <p>
  * This class provides a template for processing data matching logic in plugins. Subclasses are expected
  * to implement the abstract methods to define specific behaviors for handling empty data, matching data,
@@ -24,15 +42,18 @@
  * @param <T> the type of data to be matched, extending {@link BaseData}
  */
 public abstract class AbstractMatchDecisionMaker<T extends BaseData> {
-    private final DataProvider<T> dataProvider;
+
     protected static final String URI_CONDITION_TYPE = "uri";
 
+    private final DataProvider<T> dataProvider;
+
+
     /**
      * Constructs an AbstractMatchDecisionMaker with the specified data provider.
      *
      * @param dataProvider the data provider used to retrieve data for matching
      */
-    protected AbstractMatchDecisionMaker(DataProvider<T> dataProvider) {
+    protected AbstractMatchDecisionMaker(final DataProvider<T> dataProvider) {
         this.dataProvider = dataProvider;
     }
 
@@ -42,7 +63,7 @@ protected AbstractMatchDecisionMaker(DataProvider<T> dataProvider) {
      * @param key the key used to retrieve data
      * @return a list of data objects associated with the key
      */
-    public List<T> getData(String key) {
+    public List<T> getData(final String key) {
         return dataProvider.getData(key);
     }
 

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/maker/PluginDataDecisionMaker.java

@@ -1,3 +1,20 @@
+/*
+ * 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.base.maker;
 
 import org.apache.shenyu.common.dto.PluginData;
@@ -61,7 +78,7 @@ public PluginDataDecisionMaker() {
      * @return a Mono indicating completion of the empty handler operation
      */
     @Override
-    public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, ShenyuPluginChain chain) {
+    public Mono<Void> handleEmpty(final String pluginName, final ServerWebExchange exchange, final ShenyuPluginChain chain) {
         return chain.execute(exchange);
     }
 
@@ -85,7 +102,7 @@ public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, She
      * @return the matched PluginData, or null if the data list is empty
      */
     @Override
-    public PluginData matchData(ServerWebExchange exchange, String dataName, List<PluginData> dataList, String path, SelectorData selectorData) {
+    public PluginData matchData(final ServerWebExchange exchange, final String dataName, final List<PluginData> dataList, final String path, final SelectorData selectorData) {
         return dataList.isEmpty() ? null : dataList.get(0);
     }
 
@@ -104,7 +121,7 @@ public PluginData matchData(ServerWebExchange exchange, String dataName, List<Pl
      * @return true if the plugin is enabled and should continue processing, false otherwise
      */
     @Override
-    public boolean shouldContinue(PluginData data) {
-        return data != null && data.getEnabled();
+    public boolean shouldContinue(final PluginData data) {
+        return data.getEnabled();
     }
 }

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/maker/RuleDataDecisionMaker.java

@@ -1,3 +1,20 @@
+/*
+ * 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.base.maker;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -20,8 +37,12 @@
 import org.apache.shenyu.plugin.base.trie.ShenyuTrieNode;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static org.apache.shenyu.plugin.api.ShenyuPlugin.LOG;
@@ -58,6 +79,7 @@
 public class RuleDataDecisionMaker extends AbstractMatchDecisionMaker<RuleData> {
 
     private ShenyuConfig.RuleMatchCache ruleMatchConfig;
+
     private ShenyuTrie ruleTrie;
 
     /**
@@ -86,7 +108,7 @@ public RuleDataDecisionMaker() {
      * @return a Mono indicating completion of the empty handler operation
      */
     @Override
-    public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, ShenyuPluginChain chain) {
+    public Mono<Void> handleEmpty(final String pluginName, final ServerWebExchange exchange, final ShenyuPluginChain chain) {
         return chain.execute(exchange);
     }
 
@@ -111,7 +133,7 @@ public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, She
      * @return the matched RuleData, or null if no suitable rule is found
      */
     @Override
-    public RuleData matchData(ServerWebExchange exchange, String ruleName, List<RuleData> dataList, String path, SelectorData selectorData) {
+    public RuleData matchData(final ServerWebExchange exchange, final String ruleName, final List<RuleData> dataList, final String path, final SelectorData selectorData) {
         return dataList.isEmpty() ? trieMatchRule(exchange, ruleName, selectorData, path) : dataList.get(0);
     }
 
@@ -126,9 +148,10 @@ public RuleData matchData(ServerWebExchange exchange, String ruleName, List<Rule
      * @param data the rule data to evaluate for continuation
      * @return true if the rule is enabled and should continue processing, false otherwise
      */
+
     @Override
-    public boolean shouldContinue(RuleData data) {
-        return data != null && data.getEnabled();
+    public boolean shouldContinue(final RuleData data) {
+        return data.getEnabled();
     }
 
     /**
@@ -167,7 +190,7 @@ private void initCacheConfig() {
      * @param path the request path to match
      * @return the matched RuleData, or null if no match is found or trie matching is disabled
      */
-    private RuleData trieMatchRule(final ServerWebExchange exchange, String ruleName, final SelectorData selectorData, final String path) {
+    private RuleData trieMatchRule(final ServerWebExchange exchange, final String ruleName, final SelectorData selectorData, final String path) {
         if (!ruleMatchConfig.getTrie().getEnabled()) {
             return null;
         }

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/maker/SelectorDataDecisionMaker.java

@@ -1,3 +1,20 @@
+/*
+ * 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.base.maker;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -21,7 +38,12 @@
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static org.apache.shenyu.plugin.api.ShenyuPlugin.LOG;
@@ -53,6 +75,7 @@
 public class SelectorDataDecisionMaker extends AbstractMatchDecisionMaker<SelectorData> {
 
     private ShenyuConfig.SelectorMatchCache selectorMatchConfig;
+
     private ShenyuTrie selectorTrie;
 
     /**
@@ -78,7 +101,7 @@ public SelectorDataDecisionMaker() {
      * @return a Mono indicating completion of the empty handling operation
      */
     @Override
-    public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, ShenyuPluginChain chain) {
+    public Mono<Void> handleEmpty(final String pluginName, final ServerWebExchange exchange, final ShenyuPluginChain chain) {
         return chain.execute(exchange);
     }
 
@@ -107,7 +130,7 @@ public Mono<Void> handleEmpty(String pluginName, ServerWebExchange exchange, She
      *
      */
     @Override
-    public SelectorData matchData(ServerWebExchange exchange, String pluginName, List<SelectorData> dataList, String path, SelectorData selectorData) {
+    public SelectorData matchData(final ServerWebExchange exchange, final String pluginName, final List<SelectorData> dataList, final String path, final SelectorData selectorData) {
         return dataList.isEmpty() ? trieMatchSelector(exchange, pluginName, path) : dataList.get(0);
     }
 
@@ -123,8 +146,8 @@ public SelectorData matchData(ServerWebExchange exchange, String pluginName, Lis
      *         false otherwise
      */
     @Override
-    public boolean shouldContinue(SelectorData data) {
-        return data != null && data.getEnabled() && data.getContinued();
+    public boolean shouldContinue(final SelectorData data) {
+        return data.getEnabled() && data.getContinued();
     }
 
     /**
@@ -282,7 +305,7 @@ private SelectorData manyMatchSelector(final List<SelectorData> filterCollectors
      * @param selectorData the selector data to cache
      * @param selectorMatchConfig the cache configuration parameters
      */
-    private void cacheSelectorData(final String path, final SelectorData selectorData, ShenyuConfig.SelectorMatchCache selectorMatchConfig) {
+    private void cacheSelectorData(final String path, final SelectorData selectorData, final ShenyuConfig.SelectorMatchCache selectorMatchConfig) {
         if (Boolean.FALSE.equals(selectorMatchConfig.getCache().getEnabled()) || Objects.isNull(selectorData)
             || Boolean.TRUE.equals(selectorData.getMatchRestful())) {
             return;

shenyu-plugin/shenyu-plugin-base/src/main/java/org/apache/shenyu/plugin/base/provider/DataProvider.java

@@ -1,22 +1,26 @@
+/*
+ * 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.base.provider;
 
 import java.util.List;
 
 /**
  * A generic interface for providing data based on a given key.
- * <p>
- * Implementations of this interface are responsible for retrieving a list of data items
- * of type {@code T} associated with the specified key. This can be used in plugin systems
- * or other contexts where data needs to be fetched dynamically.
- *
- * @param <T> Names of various data types
-
-/**
- * A generic interface for providing data based on a given key.
- * <p>
- * Implementations of this interface are responsible for retrieving a list of data items
- * of type {@code T} associated with the specified key. This can be used in plugin systems
- * or other contexts where data needs to be fetched dynamically.
  *
  * @param <T> the type of data provided by this provider
  */