ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-08 16:57:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: 调整代码风格 null != xx => xx != null（更符合大众风格）

Browse Source
This commit is contained in:
Charles7c
2025-05-17 13:50:59 +08:00
parent 49bd289e29
commit ae7a267c1d
19 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java
View File

@@ -64,13 +64,13 @@ public class CrudRequestMappingHandlerMapping extends RequestMappingHandlerMappi
@NonNull Class<?> handlerType,
CrudRequestMapping crudRequestMapping) {
RequestMappingInfo info = this.buildRequestMappingInfo(method);
if (null != info) {
if (info != null) {
RequestMappingInfo typeInfo = this.buildRequestMappingInfo(handlerType);
if (null != typeInfo) {
if (typeInfo != null) {
info = typeInfo.combine(info);
}
String prefix = crudRequestMapping.value();
if (null != prefix) {
if (prefix != null) {
RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
options.setPatternParser(PathPatternParser.defaultInstance);
info = RequestMappingInfo.paths(prefix).options(options).build().combine(info);

10
continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java
View File

@@ -120,7 +120,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
default -> throw new IllegalArgumentException("暂不支持 [%s] 数据权限".formatted(dataScope));
}
}
return null != where ? new AndExpression(where, new ParenthesedExpressionList<>(expression)) : expression;
return where != null ? new AndExpression(where, new ParenthesedExpressionList<>(expression)) : expression;
}
/**
@@ -176,7 +176,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
InExpression inExpression = new InExpression();
inExpression.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId()));
inExpression.setRightExpression(subSelect);
return null != expression ? new OrExpression(expression, inExpression) : inExpression;
return expression != null ? new OrExpression(expression, inExpression) : inExpression;
}
/**
@@ -197,7 +197,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
EqualsTo equalsTo = new EqualsTo();
equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId()));
equalsTo.setRightExpression(new LongValue(userContext.getDeptId()));
return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
return expression != null ? new OrExpression(expression, equalsTo) : equalsTo;
}
/**
@@ -218,7 +218,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
EqualsTo equalsTo = new EqualsTo();
equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.userId()));
equalsTo.setRightExpression(new LongValue(userContext.getUserId()));
return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
return expression != null ? new OrExpression(expression, equalsTo) : equalsTo;
}
/**
@@ -250,7 +250,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
InExpression inExpression = new InExpression();
inExpression.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId()));
inExpression.setRightExpression(subSelect);
return null != expression ? new OrExpression(expression, inExpression) : inExpression;
return expression != null ? new OrExpression(expression, inExpression) : inExpression;
}
/**

4
continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java
View File

@@ -41,7 +41,7 @@ public class DefaultTenantLineHandler implements TenantLineHandler {
@Override
public Expression getTenantId() {
Long tenantId = TenantContextHolder.getTenantId();
if (null != tenantId) {
if (tenantId != null) {
return new LongValue(tenantId);
}
return null;
@@ -55,7 +55,7 @@ public class DefaultTenantLineHandler implements TenantLineHandler {
@Override
public boolean ignoreTable(String tableName) {
Long tenantId = TenantContextHolder.getTenantId();
if (null != tenantId && tenantId.equals(tenantProperties.getSuperTenantId())) {
if (tenantId != null && tenantId.equals(tenantProperties.getSuperTenantId())) {
return true;
}
if (TenantIsolationLevel.DATASOURCE.equals(TenantContextHolder.getIsolationLevel())) {