Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions script/shenyu_checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion ...r-api/src/main/java/org/apache/shenyu/admin/listener/AbstractNodeDataChangedListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion ...n-listener-apollo/src/main/java/org/apache/shenyu/admin/listener/apollo/ApolloClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;

import java.util.Date;
import java.util.Objects;
import java.util.Optional;

/**
Expand Down Expand Up @@ -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")) {
Expand Down
6 changes: 4 additions & 2 deletions ...is/src/main/java/org/apache/shenyu/admin/listener/polaris/PolarisDataChangedListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Objects;

/**
* Use polaris to push data changes.
*/
Expand Down Expand Up @@ -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));
}
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...r-zookeeper/src/main/java/org/apache/shenyu/admin/listener/zookeeper/ZookeeperClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 2 additions & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))) {
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/apache/shenyu/admin/mode/cluster/impl/zookeeper/ClusterZookeeperClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchCommonDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/BatchNamespaceCommonDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DetailDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/DiscoveryDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/FieldDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/MetaDataDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/NamespacePluginDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScalePolicyDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ScaleRuleDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/SelectorDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthParamDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DetailDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryHandlerDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryRelDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ModelDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespacePluginRelDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/NamespaceUserRelDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PermissionDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginHandleDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ResourceDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Loading
Loading