[type:feature] use checkstyle to avoid ==null check (apache#5927)

cntigers · Feb 8, 2025 · 60676c1 · 60676c1
1 parent d01c5ec
commit 60676c1
Show file tree

Hide file tree

Showing 200 changed files with 380 additions and 292 deletions.
diff --git a/script/shenyu_checkstyle.xml b/script/shenyu_checkstyle.xml
@@ -268,5 +268,29 @@
         <!-- Filters -->
         <module name="SuppressionCommentFilter"/>
         <module name="SuppressWithNearbyCommentFilter"/>
+
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="==\s*null"/>
+            <property name="message" value="Use Objects.isNull() instead of == null"/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="null\s*=="/>
+            <property name="message" value="Use Objects.isNull() instead of null =="/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="!=\s*null"/>
+            <property name="message" value="Use Objects.nonNull() instead of != null"/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="null\s*!="/>
+            <property name="message" value="Use Objects.nonNull() instead of null !="/>
+            <property name="ignoreComments" value="true"/>
+        </module>
     </module>
 </module>
diff --git a/...r-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java b/...r-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
@@ -36,6 +36,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -130,7 +131,7 @@ private <T> void onCommonChanged(final String configKeyPrefix, final List<T> cha
                     final List<String> configDataNames = this.getConfigDataNames(configKeyPrefix);
                     changedList.forEach(changedData -> publishConfig(configKeyPrefix + mapperToKey.apply(changedData), changedData));
 
-                    if (configDataNames != null && configDataNames.size() > changedList.size()) {
+                    if (Objects.nonNull(configDataNames) && configDataNames.size() > changedList.size()) {
                         configDataNames.removeAll(changeNames);
                         configDataNames.forEach(this::delConfig);
                     }

diff --git a/...n-listener-apollo/src/main/java/org/apache/shenyu/admin/listener/apollo/ApolloClient.java b/...n-listener-apollo/src/main/java/org/apache/shenyu/admin/listener/apollo/ApolloClient.java
@@ -27,6 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Date;
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -65,7 +66,7 @@ public String getItemValue(final String key) {
                 apolloConfig.getClusterName(),
                 apolloConfig.getNamespace(),
                 key);
-        if (openItemDTO == null) {
+        if (Objects.isNull(openItemDTO)) {
             return null;
         }
         if (openItemDTO.getKey().equals("timeout")) {

diff --git a/...is/src/main/java/org/apache/shenyu/admin/listener/polaris/PolarisDataChangedListener.java b/...is/src/main/java/org/apache/shenyu/admin/listener/polaris/PolarisDataChangedListener.java
@@ -31,6 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+
 /**
  * Use polaris to push data changes.
  */
@@ -61,7 +63,7 @@ public void doPublishConfig(final String dataId, final Object data) {
                     polarisProperties.getFileGroup(),
                     dataId);
             if (isReleased(metadata)) {
-                configFilePublishService.updateConfigFile(metadata, data == null ? "" : GsonUtils.getInstance().toJson(data));
+                configFilePublishService.updateConfigFile(metadata, Objects.isNull(data) ? "" : GsonUtils.getInstance().toJson(data));
             } else {
                 configFilePublishService.createConfigFile(metadata, GsonUtils.getInstance().toJson(data));
             }
@@ -89,7 +91,7 @@ public String getConfig(final String dataId) {
 
     private boolean isReleased(final DefaultConfigFileMetadata metadata) {
         try {
-            return configFileService.getConfigFile(metadata).getContent() != null;
+            return Objects.nonNull(configFileService.getConfigFile(metadata).getContent());
         } catch (PolarisException e) {
             LOG.error("Polaris Get data from polaris error.", e);
             throw new ShenyuException(e.getMessage());

diff --git a/...r-zookeeper/src/main/java/org/apache/shenyu/admin/listener/zookeeper/ZookeeperClient.java b/...r-zookeeper/src/main/java/org/apache/shenyu/admin/listener/zookeeper/ZookeeperClient.java
@@ -109,7 +109,7 @@ public CuratorFramework getClient() {
      */
     public boolean isExist(final String key) {
         try {
-            return null != client.checkExists().forPath(key);
+            return Objects.nonNull(client.checkExists().forPath(key));
         } catch (Exception e) {
             return false;
         }
@@ -181,7 +181,7 @@ public void createOrUpdate(final String key, final String value, final CreateMod
      * @param mode  creation mode.
      */
     public void createOrUpdate(final String key, final Object value, final CreateMode mode) {
-        if (value != null) {
+        if (Objects.nonNull(value)) {
             String val = GsonUtils.getInstance().toJson(value);
             createOrUpdate(key, val, mode);
         } else {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
@@ -44,6 +44,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Objects;
+
 /**
  * this is selector controller.
  */
@@ -76,7 +78,7 @@ public AdminResult<CommonPager<SelectorVO>> querySelectors(final String pluginId
         condition.setUserId(SessionUtil.visitor().getUserId());
         condition.setPlugin(ListUtil.of(pluginId));
         condition.setKeyword(name);
-        if (namespaceId != null) {
+        if (Objects.nonNull(namespaceId)) {
             condition.setNamespaceId(namespaceId);
         }
         return searchAdaptor(new PageCondition<>(currentPage, pageSize, condition));

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
@@ -45,6 +45,7 @@
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.ArrayList;
@@ -107,7 +108,7 @@ public void createDiscovery(final DiscoveryDO discoveryDO) {
     @Override
     public void removeDiscovery(final DiscoveryDO discoveryDO) {
         ShenyuDiscoveryService shenyuDiscoveryService = discoveryServiceCache.remove(discoveryDO.getId());
-        if (shenyuDiscoveryService == null) {
+        if (Objects.isNull(shenyuDiscoveryService)) {
             return;
         }
         if (discoveryServiceCache.values().stream().noneMatch(p -> p.equals(shenyuDiscoveryService))) {

diff --git a/...main/java/org/apache/shenyu/admin/mode/cluster/impl/zookeeper/ClusterZookeeperClient.java b/...main/java/org/apache/shenyu/admin/mode/cluster/impl/zookeeper/ClusterZookeeperClient.java
@@ -110,7 +110,7 @@ public CuratorFramework getClient() {
      */
     public boolean isExist(final String key) {
         try {
-            return null != client.checkExists().forPath(key);
+            return Objects.nonNull(client.checkExists().forPath(key));
         } catch (Exception e) {
             throw new ShenyuException(e);
         }
@@ -182,7 +182,7 @@ public void createOrUpdate(final String key, final String value, final CreateMod
      * @param mode  creation mode.
      */
     public void createOrUpdate(final String key, final Object value, final CreateMode mode) {
-        if (value != null) {
+        if (Objects.nonNull(value)) {
             String val = GsonUtils.getInstance().toJson(value);
             createOrUpdate(key, val, mode);
         } else {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchCommonDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchCommonDTO.java
@@ -98,7 +98,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         BatchCommonDTO that = (BatchCommonDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchNamespaceCommonDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchNamespaceCommonDTO.java
@@ -102,7 +102,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         BatchNamespaceCommonDTO that = (BatchNamespaceCommonDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DetailDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DetailDTO.java
@@ -192,7 +192,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         DetailDTO detailDTO = (DetailDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DiscoveryDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DiscoveryDTO.java
@@ -268,7 +268,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
 

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/FieldDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/FieldDTO.java
@@ -250,7 +250,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/MetaDataDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/MetaDataDTO.java
@@ -340,7 +340,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         MetaDataDTO that = (MetaDataDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/NamespacePluginDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/NamespacePluginDTO.java
@@ -234,7 +234,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         NamespacePluginDTO that = (NamespacePluginDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java
@@ -256,7 +256,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         PluginDTO pluginDTO = (PluginDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScalePolicyDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScalePolicyDTO.java
@@ -205,7 +205,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         ScalePolicyDTO that = (ScalePolicyDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScaleRuleDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScaleRuleDTO.java
@@ -228,7 +228,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         ScaleRuleDTO that = (ScaleRuleDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/SelectorDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/SelectorDTO.java
@@ -420,7 +420,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         SelectorDTO that = (SelectorDTO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthParamDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthParamDO.java
@@ -132,7 +132,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java
@@ -145,7 +145,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DetailDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DetailDO.java
@@ -122,7 +122,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
@@ -205,7 +205,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryHandlerDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryHandlerDO.java
@@ -130,7 +130,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryRelDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryRelDO.java
@@ -131,7 +131,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
@@ -168,7 +168,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ModelDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ModelDO.java
@@ -85,7 +85,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespacePluginRelDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespacePluginRelDO.java
@@ -149,7 +149,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespaceUserRelDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespaceUserRelDO.java
@@ -84,7 +84,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         NamespaceUserRelDO that = (NamespaceUserRelDO) o;

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
@@ -192,7 +192,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PermissionDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PermissionDO.java
@@ -123,7 +123,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginDO.java
@@ -259,7 +259,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginHandleDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginHandleDO.java
@@ -249,7 +249,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ResourceDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ResourceDO.java
@@ -414,7 +414,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         if (!super.equals(o)) {