Merge pull request #178 from power4j/feature/lint

fix lint warning
power4j · Sep 5, 2023 · 6d86e81 · 6d86e81
2 parents 32f7516 + 9360085
commit 6d86e81
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 36 deletions.
diff --git a/...-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/crud/repository/Repository.java b/...-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/crud/repository/Repository.java
@@ -20,10 +20,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.power4j.fist.boot.mybaits.crud.repository.matcher.Eq;
 import com.power4j.fist.data.crud.repository.PagingAndSortingRepository;
 import com.power4j.fist.data.domain.Pageable;
 import com.power4j.fist.data.domain.Paged;
-import com.power4j.fist.boot.mybaits.crud.repository.matcher.Eq;
 import org.springframework.lang.Nullable;
 
 import java.io.Serializable;

diff --git a/...ist-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/entity/AuditEntity.java b/...ist-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/entity/AuditEntity.java
@@ -95,15 +95,15 @@ public void markUserAttr() {
 	 * @return true 表示是系统数据
 	 */
 	public boolean checkSysAttr() {
-		return Objects.nonNull(lowAttr) && DataConstant.LOW_ATTR_VALUE_SYSTEM == lowAttr;
+		return Objects.equals(DataConstant.LOW_ATTR_VALUE_SYSTEM, lowAttr);
 	}
 
 	/**
 	 * 检测是否用户数据
 	 * @return true 表示是用户数据
 	 */
 	public boolean checkUserAttr() {
-		return Objects.nonNull(lowAttr) && DataConstant.LOW_ATTR_VALUE_USER == lowAttr;
+		return Objects.equals(DataConstant.LOW_ATTR_VALUE_USER, lowAttr);
 	}
 
 }
diff --git a/...st-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/handler/AuditFiller.java b/...st-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/handler/AuditFiller.java
@@ -17,10 +17,10 @@
 package com.power4j.fist.boot.mybaits.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.power4j.fist.data.constant.DataConstant;
 import com.power4j.fist.boot.mybaits.entity.AuditEntity;
 import com.power4j.fist.boot.security.core.UserInfo;
 import com.power4j.fist.boot.security.core.UserInfoSupplier;
+import com.power4j.fist.data.constant.DataConstant;
 import org.apache.ibatis.reflection.MetaObject;
 
 import java.time.LocalDateTime;

diff --git a/...t-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/tenant/TenantHandler.java b/...t-boot-crud-mybatis/src/main/java/com/power4j/fist/boot/mybaits/tenant/TenantHandler.java
@@ -17,8 +17,8 @@
 package com.power4j.fist.boot.mybaits.tenant;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.power4j.fist.data.tenant.isolation.TenantHolder;
 import com.power4j.fist.boot.security.core.SecurityConstant;
+import com.power4j.fist.data.tenant.isolation.TenantHolder;
 import lombok.Setter;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;

diff --git a/...-app/fist-data/fist-boot-data/src/main/java/com/power4j/fist/boot/web/model/PageData.java b/...-app/fist-data/fist-boot-data/src/main/java/com/power4j/fist/boot/web/model/PageData.java
@@ -69,7 +69,8 @@ public static <T> PageData<T> of(Paged<T> paged) {
 	}
 
 	public static <T> PageData<T> of(PageDTO<T> dto) {
-		return new PageData(dto.getContent(), dto.getTotal(), dto.getHasNext(), dto.getPageNumber(), dto.getPageSize());
+		return new PageData<>(dto.getContent(), dto.getTotal(), dto.getHasNext(), dto.getPageNumber(),
+				dto.getPageSize());
 	}
 
 	public static <T> PageDTO<T> toPageDTO(PageData<T> src) {

diff --git a/...p/fist-data/fist-boot-data/src/main/java/com/power4j/fist/data/tenant/InTenantAspect.java b/...p/fist-data/fist-boot-data/src/main/java/com/power4j/fist/data/tenant/InTenantAspect.java
@@ -16,11 +16,11 @@
 
 package com.power4j.fist.data.tenant;
 
+import com.power4j.fist.data.tenant.annotation.InTenant;
+import com.power4j.fist.data.tenant.isolation.TenantBroker;
 import com.power4j.fist.support.spring.aop.AopUtil;
 import com.power4j.fist.support.spring.spel.MethodParameterResolver;
 import com.power4j.fist.support.spring.spel.SpringElUtil;
-import com.power4j.fist.data.tenant.annotation.InTenant;
-import com.power4j.fist.data.tenant.isolation.TenantBroker;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ata/fist-support-data/src/main/java/com/power4j/fist/data/crud/validate/ValidateUtil.java b/...ata/fist-support-data/src/main/java/com/power4j/fist/data/crud/validate/ValidateUtil.java
@@ -25,7 +25,7 @@
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validation;
 import javax.validation.ValidationException;
-import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
 import java.util.Locale;
 import java.util.Set;
 import java.util.function.Function;
@@ -54,14 +54,13 @@ private static ResourceBundleMessageSource getMessageSource() {
 	 */
 	public static <T> Set<ConstraintViolation<T>> check(T object, Class<?>... groups) {
 		Locale.setDefault(LocaleContextHolder.getLocale());
-		Validator validator = Validation.byDefaultProvider()
+		try (ValidatorFactory validatorFactory = Validation.byDefaultProvider()
 			.configure()
 			.messageInterpolator(
 					new ResourceBundleMessageInterpolator(new MessageSourceResourceBundleLocator(getMessageSource())))
-			.buildValidatorFactory()
-			.getValidator();
-
-		return validator.validate(object, groups);
+			.buildValidatorFactory()) {
+			return validatorFactory.getValidator().validate(object, groups);
+		}
 	}
 
 	/**

diff --git a/...er/src/main/java/com/power4j/fist/autoconfigure/security/ResourceServerConfiguration.java b/...er/src/main/java/com/power4j/fist/autoconfigure/security/ResourceServerConfiguration.java
@@ -17,9 +17,9 @@
 package com.power4j.fist.autoconfigure.security;
 
 import com.power4j.coca.kit.common.exception.RuntimeFaultException;
-import com.power4j.fist.boot.security.config.ResourceServerSecurityConfig;
 import com.power4j.fist.boot.security.config.JwtTokenExtractor;
 import com.power4j.fist.boot.security.config.ResourceServerConfig;
+import com.power4j.fist.boot.security.config.ResourceServerSecurityConfig;
 import com.power4j.fist.boot.security.config.SecurityProperties;
 import com.power4j.fist.boot.security.oauth2.AuthUserConverter;
 import lombok.RequiredArgsConstructor;

diff --git a/...-security/src/test/java/com/power4j/fist/boot/security/crypto/Sm3PasswordEncoderTest.java b/...-security/src/test/java/com/power4j/fist/boot/security/crypto/Sm3PasswordEncoderTest.java
@@ -19,8 +19,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 /**
  * @author CJ ([email protected])
  * @date 2022/3/7
@@ -37,4 +35,4 @@ void encode() {
 		Assertions.assertTrue(matched);
 	}
 
-}
+}
diff --git a/...b-app/src/main/java/com/power4j/fist/boot/autoconfigure/web/FistWebAutoConfiguration.java b/...b-app/src/main/java/com/power4j/fist/boot/autoconfigure/web/FistWebAutoConfiguration.java
@@ -16,9 +16,9 @@
 
 package com.power4j.fist.boot.autoconfigure.web;
 
-import com.power4j.fist.boot.web.constant.HttpConstant;
 import com.power4j.fist.boot.mon.info.TraceInfo;
 import com.power4j.fist.boot.mon.info.TraceInfoResolver;
+import com.power4j.fist.boot.web.constant.HttpConstant;
 import com.power4j.fist.boot.web.servlet.mvc.formatter.LocalDateFormatter;
 import com.power4j.fist.boot.web.servlet.mvc.formatter.LocalDateTimeFormatter;
 import com.power4j.fist.boot.web.servlet.mvc.formatter.LocalTimeFormatter;

diff --git a/.../fist-support-web/src/main/java/com/power4j/fist/boot/common/error/RejectedException.java b/.../fist-support-web/src/main/java/com/power4j/fist/boot/common/error/RejectedException.java
@@ -36,7 +36,7 @@ public class RejectedException extends RuntimeException {
 	@Nullable
 	private final String hint;
 
-	private HttpStatus status = HttpStatus.OK;
+	private HttpStatus status;
 
 	/**
 	 * 构造函数，不会进行国际化处理

diff --git a/.../fist-web/fist-support-web/src/main/java/com/power4j/fist/boot/mon/annotation/ApiLog.java b/.../fist-web/fist-support-web/src/main/java/com/power4j/fist/boot/mon/annotation/ApiLog.java
@@ -16,12 +16,13 @@
 
 package com.power4j.fist.boot.mon.annotation;
 
+import org.springframework.core.annotation.AliasFor;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.springframework.core.annotation.AliasFor;
 
 /**
  * @author CJ ([email protected])

diff --git a/...ist-web/fist-support-web/src/main/java/com/power4j/fist/boot/mon/aspect/ApiLogAspect.java b/...ist-web/fist-support-web/src/main/java/com/power4j/fist/boot/mon/aspect/ApiLogAspect.java
@@ -19,7 +19,6 @@
 import com.power4j.coca.kit.common.datetime.DateTimeKit;
 import com.power4j.coca.kit.common.lang.Result;
 import com.power4j.coca.kit.common.text.StringPool;
-import com.power4j.fist.support.spring.aop.AopUtil;
 import com.power4j.fist.boot.mon.ApiDescriptionResolver;
 import com.power4j.fist.boot.mon.EventUtils;
 import com.power4j.fist.boot.mon.annotation.ApiLog;
@@ -30,6 +29,7 @@
 import com.power4j.fist.boot.mon.info.ExceptionTranslator;
 import com.power4j.fist.boot.mon.info.HttpRequestInfo;
 import com.power4j.fist.boot.security.core.UserInfoAccessor;
+import com.power4j.fist.support.spring.aop.AopUtil;
 import com.power4j.fist.support.spring.util.SpringEventUtil;
 import com.power4j.fist.support.spring.web.servlet.util.HttpServletRequestUtil;
 import lombok.RequiredArgsConstructor;

diff --git a/...eb/fist-support-web/src/main/java/com/power4j/fist/boot/mon/aspect/ReportErrorAspect.java b/...eb/fist-support-web/src/main/java/com/power4j/fist/boot/mon/aspect/ReportErrorAspect.java
@@ -17,11 +17,11 @@
 package com.power4j.fist.boot.mon.aspect;
 
 import com.power4j.coca.kit.common.text.StringPool;
+import com.power4j.fist.boot.mon.EventUtils;
+import com.power4j.fist.boot.mon.annotation.ReportError;
 import com.power4j.fist.support.spring.aop.AopUtil;
 import com.power4j.fist.support.spring.spel.MethodParameterResolver;
 import com.power4j.fist.support.spring.spel.SpringElUtil;
-import com.power4j.fist.boot.mon.EventUtils;
-import com.power4j.fist.boot.mon.annotation.ReportError;
 import com.power4j.fist.support.spring.util.SpringEventUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

diff --git a/...t-web/src/main/java/com/power4j/fist/boot/web/servlet/error/AbstractExceptionHandler.java b/...t-web/src/main/java/com/power4j/fist/boot/web/servlet/error/AbstractExceptionHandler.java
@@ -21,10 +21,10 @@
 import com.power4j.fist.boot.mon.info.InfoUtil;
 import com.power4j.fist.boot.mon.info.TraceInfo;
 import com.power4j.fist.boot.mon.info.TraceInfoResolver;
-import com.power4j.fist.support.spring.util.ApplicationContextHolder;
-import com.power4j.fist.support.spring.util.SpringEventUtil;
 import com.power4j.fist.boot.web.event.error.HandlerErrorEvent;
 import com.power4j.fist.boot.web.event.error.RequestInfo;
+import com.power4j.fist.support.spring.util.ApplicationContextHolder;
+import com.power4j.fist.support.spring.util.SpringEventUtil;
 import com.power4j.fist.support.spring.web.servlet.util.HttpServletRequestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

diff --git a/...support-web/src/main/java/com/power4j/fist/boot/web/servlet/error/ClientErrorHandler.java b/...support-web/src/main/java/com/power4j/fist/boot/web/servlet/error/ClientErrorHandler.java
@@ -40,7 +40,6 @@
 
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
-import javax.validation.Path;
 import javax.validation.ValidationException;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -99,7 +98,7 @@ public Result<Object> handleException(BindException e) {
 	@ResponseStatus(HttpStatus.BAD_REQUEST)
 	public Result<Object> handleException(ConstraintViolationException e) {
 		ConstraintViolation<?> violation = e.getConstraintViolations().iterator().next();
-		String path = ((Path) violation.getPropertyPath()).toString();
+		String path = violation.getPropertyPath().toString();
 		log.warn("请求参数校验失败:{}", path);
 		return Results.requestParameterError(violation.getMessage(), path);
 	}

diff --git a/...gateway-acl/src/main/java/com/power4j/fist/cloud/security/DefaultAccessDeniedHandler.java b/...gateway-acl/src/main/java/com/power4j/fist/cloud/security/DefaultAccessDeniedHandler.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.power4j.fist.boot.common.error.ErrorCode;
-import com.power4j.fist.support.spring.web.reactive.util.ServerHttpResponseUtil;
 import com.power4j.fist.cloud.gateway.authorization.domain.AuthProblem;
+import com.power4j.fist.support.spring.web.reactive.util.ServerHttpResponseUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpResponse;

diff --git a/...ve/src/main/java/com/power4j/fist/autoconfigure/gateway/security/AuthFilterConfigure.java b/...ve/src/main/java/com/power4j/fist/autoconfigure/gateway/security/AuthFilterConfigure.java
@@ -48,7 +48,6 @@
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
 import java.util.List;
@@ -157,7 +156,7 @@ public UserPermissionFilter userPermissionFilter() {
 	}
 
 	@Bean
-	@Order(Ordered.LOWEST_PRECEDENCE)
+	@Order
 	public AuthEndFilter authEndFilter() {
 		return new AuthEndFilter();
 	}

diff --git a/...wer4j/fist/cloud/gateway/authorization/filter/reactive/impl/LoadUserPermissionFilter.java b/...wer4j/fist/cloud/gateway/authorization/filter/reactive/impl/LoadUserPermissionFilter.java
@@ -17,10 +17,10 @@
 package com.power4j.fist.cloud.gateway.authorization.filter.reactive.impl;
 
 import com.power4j.fist.cloud.gateway.authorization.domain.AuthContext;
-import com.power4j.fist.security.core.authorization.domain.AuthenticatedUser;
 import com.power4j.fist.cloud.gateway.authorization.filter.reactive.GatewayAuthFilter;
-import com.power4j.fist.security.core.authorization.service.reactive.UserService;
+import com.power4j.fist.security.core.authorization.domain.AuthenticatedUser;
 import com.power4j.fist.security.core.authorization.filter.reactive.ServerAuthFilterChain;
+import com.power4j.fist.security.core.authorization.service.reactive.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;

diff --git a/...way/fist-gateway-auth-core/src/main/java/com/power4j/fist/cloud/gateway/package-info.java b/...way/fist-gateway-auth-core/src/main/java/com/power4j/fist/cloud/gateway/package-info.java
@@ -21,7 +21,7 @@
  */
 @NonNullApi
 @NonNullFields
-package com.power4j.fist.cloud.gateway.authorization;
+package com.power4j.fist.cloud.gateway;
 
 import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
+import org.springframework.lang.NonNullFields;
diff --git a/...rc/main/java/com/power4j/fist/support/spring/web/reactive/util/ServerHttpRequestUtil.java b/...rc/main/java/com/power4j/fist/support/spring/web/reactive/util/ServerHttpRequestUtil.java
@@ -43,7 +43,7 @@ public class ServerHttpRequestUtil {
 	 */
 	public Optional<String> getRemoteIp(ServerHttpRequest request) {
 		Optional<String> ip = HttpServletRequestUtil.getRemoteIp(request.getHeaders());
-		if (!ip.isPresent()) {
+		if (ip.isEmpty()) {
 			ip = Optional.ofNullable(request.getRemoteAddress())
 				.map(InetSocketAddress::getAddress)
 				.map(InetAddress::getHostAddress);