From bc5b36592ad4a8a5d1abdb4a1fb1c07b26660b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Miller=20=28=E9=94=BA=E4=BF=8A=29?= Date: Fri, 8 May 2020 17:29:29 +0800 Subject: [PATCH] perf($VarAndVal): synchronize codes - ExceptionControllerAdvice.java, MethodArgumentValidationAspect.java --- .../universal/configuration/Constants.java | 2 +- .../aspect/ExceptionControllerAdvice.java | 12 +++--- .../MethodArgumentValidationAspect.java | 33 +++++++++-------- .../aspect/ExceptionControllerAdvice.java | 12 +++--- .../MethodArgumentValidationAspect.java | 33 +++++++++-------- .../MethodArgumentValidationAspect.java | 33 +++++++++-------- .../MuscleMisApplication.java | 6 +-- .../aspect/ExceptionControllerAdvice.java | 14 +++---- .../MethodArgumentValidationAspect.java | 37 ++++++++++--------- .../universal/aspect/ValidateArgument.java | 2 +- .../universal/aspect/WebRequestLogAspect.java | 2 +- .../configuration/DruidConfiguration.java | 2 +- .../MyBatisPlusConfiguration.java | 2 +- .../configuration/ProjectProperty.java | 2 +- .../configuration/ServerConfiguration.java | 2 +- .../configuration/Swagger2Configuration.java | 2 +- .../configuration/WebMvcConfiguration.java | 2 +- .../controller/CommonController.java | 6 +-- .../universal/controller/ErrorController.java | 2 +- .../controller/RedirectController.java | 4 +- .../domain/ValidationTestPayload.java | 2 +- .../universal/filter/RequestFilter.java | 2 +- .../universal/service/CommonService.java | 4 +- .../service/impl/CommonServiceImpl.java | 10 ++--- .../MuscleMisApplicationTests.java | 2 +- .../aspect/ExceptionControllerAdvice.java | 12 +++--- .../MethodArgumentValidationAspect.java | 33 +++++++++-------- .../aspect/ExceptionControllerAdvice.java | 12 +++--- .../MethodArgumentValidationAspect.java | 33 +++++++++-------- 29 files changed, 163 insertions(+), 157 deletions(-) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/MuscleMisApplication.java (91%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/aspect/ExceptionControllerAdvice.java (94%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/aspect/MethodArgumentValidationAspect.java (83%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/aspect/ValidateArgument.java (90%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/aspect/WebRequestLogAspect.java (99%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/DruidConfiguration.java (97%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/MyBatisPlusConfiguration.java (94%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/ProjectProperty.java (94%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/ServerConfiguration.java (98%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/Swagger2Configuration.java (98%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/configuration/WebMvcConfiguration.java (95%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/controller/CommonController.java (86%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/controller/ErrorController.java (96%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/controller/RedirectController.java (93%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/domain/ValidationTestPayload.java (89%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/filter/RequestFilter.java (95%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/service/CommonService.java (79%) rename muscle-mis/src/main/java/com/jmsoftware/{exercisemis => musclemis}/universal/service/impl/CommonServiceImpl.java (92%) rename muscle-mis/src/test/java/com/jmsoftware/{exercisemis => musclemis}/MuscleMisApplicationTests.java (84%) diff --git a/api-portal/src/main/java/com/jmsoftware/apiportal/universal/configuration/Constants.java b/api-portal/src/main/java/com/jmsoftware/apiportal/universal/configuration/Constants.java index 8344440b..7081a19a 100644 --- a/api-portal/src/main/java/com/jmsoftware/apiportal/universal/configuration/Constants.java +++ b/api-portal/src/main/java/com/jmsoftware/apiportal/universal/configuration/Constants.java @@ -15,7 +15,7 @@ @Component public class Constants { public Constants(ProjectProperty projectProperty) { - REDIS_JWT_KEY_PREFIX = projectProperty.getParentArtifactId() + ":jwt:"; + REDIS_JWT_KEY_PREFIX = String.format("%s:jwt:", projectProperty.getParentArtifactId()); log.info("Initiated 'REDIS_JWT_KEY_PREFIX': {}", REDIS_JWT_KEY_PREFIX); } diff --git a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/ExceptionControllerAdvice.java b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/ExceptionControllerAdvice.java index ade665e0..c0cf3aae 100644 --- a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/ExceptionControllerAdvice.java +++ b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/ExceptionControllerAdvice.java @@ -7,6 +7,7 @@ import com.jmsoftware.common.exception.BaseException; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -124,18 +125,17 @@ public ResponseBodyBean handleException(HttpServletRequest request, */ private String getFieldErrorMessageFromException(MethodArgumentNotValidException exception) { try { - DefaultMessageSourceResolvable firstErrorField = + val firstErrorField = (DefaultMessageSourceResolvable) Objects.requireNonNull(exception.getBindingResult() .getAllErrors() .get(0) .getArguments())[0]; - String firstErrorFieldName = firstErrorField.getDefaultMessage(); - String firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - return firstErrorFieldName + " " + firstErrorFieldMessage; + val firstErrorFieldName = firstErrorField.getDefaultMessage(); + val firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + return String.format("%s %s", firstErrorFieldName, firstErrorFieldMessage); } catch (Exception e) { log.error("Exception occurred when get field error message from exception. Exception message: {}", - e.getMessage(), - e); + e.getMessage(), e); return HttpStatus.INVALID_PARAM.getMessage(); } } diff --git a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/MethodArgumentValidationAspect.java b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/MethodArgumentValidationAspect.java index d2899cb8..1f61c7d7 100644 --- a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/MethodArgumentValidationAspect.java +++ b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/aspect/MethodArgumentValidationAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); } diff --git a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java index 705ae1d0..0d33956a 100644 --- a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java +++ b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java @@ -7,6 +7,7 @@ import com.jmsoftware.common.exception.BaseException; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -124,18 +125,17 @@ public ResponseBodyBean handleException(HttpServletRequest request, */ private String getFieldErrorMessageFromException(MethodArgumentNotValidException exception) { try { - DefaultMessageSourceResolvable firstErrorField = + val firstErrorField = (DefaultMessageSourceResolvable) Objects.requireNonNull(exception.getBindingResult() .getAllErrors() .get(0) .getArguments())[0]; - String firstErrorFieldName = firstErrorField.getDefaultMessage(); - String firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - return firstErrorFieldName + " " + firstErrorFieldMessage; + val firstErrorFieldName = firstErrorField.getDefaultMessage(); + val firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + return String.format("%s %s", firstErrorFieldName, firstErrorFieldMessage); } catch (Exception e) { log.error("Exception occurred when get field error message from exception. Exception message: {}", - e.getMessage(), - e); + e.getMessage(), e); return HttpStatus.INVALID_PARAM.getMessage(); } } diff --git a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java index c9997fa2..1a6cdcbf 100644 --- a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java +++ b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); } diff --git a/gateway/src/main/java/com/jmsoftware/gateway/universal/aspect/MethodArgumentValidationAspect.java b/gateway/src/main/java/com/jmsoftware/gateway/universal/aspect/MethodArgumentValidationAspect.java index 5c37470a..0fcd6647 100644 --- a/gateway/src/main/java/com/jmsoftware/gateway/universal/aspect/MethodArgumentValidationAspect.java +++ b/gateway/src/main/java/com/jmsoftware/gateway/universal/aspect/MethodArgumentValidationAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); } diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/MuscleMisApplication.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/MuscleMisApplication.java similarity index 91% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/MuscleMisApplication.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/MuscleMisApplication.java index 61c9480d..bef55f49 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/MuscleMisApplication.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/MuscleMisApplication.java @@ -1,7 +1,7 @@ -package com.jmsoftware.exercisemis; +package com.jmsoftware.musclemis; -import com.jmsoftware.exercisemis.universal.configuration.ProjectProperty; -import com.jmsoftware.exercisemis.universal.configuration.ServerConfiguration; +import com.jmsoftware.musclemis.universal.configuration.ProjectProperty; +import com.jmsoftware.musclemis.universal.configuration.ServerConfiguration; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ExceptionControllerAdvice.java similarity index 94% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ExceptionControllerAdvice.java index 705ae1d0..6acf10b4 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ExceptionControllerAdvice.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ExceptionControllerAdvice.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.aspect; +package com.jmsoftware.musclemis.universal.aspect; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; @@ -7,6 +7,7 @@ import com.jmsoftware.common.exception.BaseException; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -124,18 +125,17 @@ public ResponseBodyBean handleException(HttpServletRequest request, */ private String getFieldErrorMessageFromException(MethodArgumentNotValidException exception) { try { - DefaultMessageSourceResolvable firstErrorField = + val firstErrorField = (DefaultMessageSourceResolvable) Objects.requireNonNull(exception.getBindingResult() .getAllErrors() .get(0) .getArguments())[0]; - String firstErrorFieldName = firstErrorField.getDefaultMessage(); - String firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - return firstErrorFieldName + " " + firstErrorFieldMessage; + val firstErrorFieldName = firstErrorField.getDefaultMessage(); + val firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + return String.format("%s %s", firstErrorFieldName, firstErrorFieldMessage); } catch (Exception e) { log.error("Exception occurred when get field error message from exception. Exception message: {}", - e.getMessage(), - e); + e.getMessage(), e); return HttpStatus.INVALID_PARAM.getMessage(); } } diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/MethodArgumentValidationAspect.java similarity index 83% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/MethodArgumentValidationAspect.java index c9997fa2..59928bf6 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/MethodArgumentValidationAspect.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/MethodArgumentValidationAspect.java @@ -1,9 +1,10 @@ -package com.jmsoftware.exercisemis.universal.aspect; +package com.jmsoftware.musclemis.universal.aspect; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -53,7 +54,7 @@ public MethodArgumentValidationAspect() { * More detail at: Spring aop aspectJ * pointcut expression examples */ - @Pointcut("@annotation(com.jmsoftware.exercisemis.universal.aspect.ValidateArgument)") + @Pointcut("@annotation(com.jmsoftware.musclemis.universal.aspect.ValidateArgument)") public void validateMethodArgumentPointcut() { } @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); } diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ValidateArgument.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ValidateArgument.java similarity index 90% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ValidateArgument.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ValidateArgument.java index 5d4d8016..21a8f2f7 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/ValidateArgument.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/ValidateArgument.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.aspect; +package com.jmsoftware.musclemis.universal.aspect; import java.lang.annotation.*; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/WebRequestLogAspect.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/WebRequestLogAspect.java similarity index 99% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/WebRequestLogAspect.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/WebRequestLogAspect.java index 8532c774..c790aa9a 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/aspect/WebRequestLogAspect.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/aspect/WebRequestLogAspect.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.aspect; +package com.jmsoftware.musclemis.universal.aspect; import cn.hutool.core.util.NumberUtil; import cn.hutool.json.JSONUtil; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/DruidConfiguration.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/DruidConfiguration.java similarity index 97% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/DruidConfiguration.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/DruidConfiguration.java index 636dcc08..9a22caac 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/DruidConfiguration.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/DruidConfiguration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.StatViewServlet; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/MyBatisPlusConfiguration.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/MyBatisPlusConfiguration.java similarity index 94% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/MyBatisPlusConfiguration.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/MyBatisPlusConfiguration.java index 7390724e..fa56947f 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/MyBatisPlusConfiguration.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/MyBatisPlusConfiguration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ProjectProperty.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ProjectProperty.java similarity index 94% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ProjectProperty.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ProjectProperty.java index ee960861..95239dab 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ProjectProperty.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ProjectProperty.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ServerConfiguration.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ServerConfiguration.java similarity index 98% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ServerConfiguration.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ServerConfiguration.java index 7c1d2ae3..b8ac7ee2 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/ServerConfiguration.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/ServerConfiguration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/Swagger2Configuration.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/Swagger2Configuration.java similarity index 98% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/Swagger2Configuration.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/Swagger2Configuration.java index 55e44d97..289e9b74 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/Swagger2Configuration.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/Swagger2Configuration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/WebMvcConfiguration.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/WebMvcConfiguration.java similarity index 95% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/WebMvcConfiguration.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/WebMvcConfiguration.java index 961b9a4a..d7a51084 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/configuration/WebMvcConfiguration.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/configuration/WebMvcConfiguration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.configuration; +package com.jmsoftware.musclemis.universal.configuration; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/CommonController.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/CommonController.java similarity index 86% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/CommonController.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/CommonController.java index 203a100b..a294cee7 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/CommonController.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/CommonController.java @@ -1,8 +1,8 @@ -package com.jmsoftware.exercisemis.universal.controller; +package com.jmsoftware.musclemis.universal.controller; import com.jmsoftware.common.bean.ResponseBodyBean; -import com.jmsoftware.exercisemis.universal.domain.ValidationTestPayload; -import com.jmsoftware.exercisemis.universal.service.CommonService; +import com.jmsoftware.musclemis.universal.domain.ValidationTestPayload; +import com.jmsoftware.musclemis.universal.service.CommonService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java similarity index 96% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java index 7d7aed9a..9ae11761 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.controller; +package com.jmsoftware.musclemis.universal.controller; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/RedirectController.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/RedirectController.java similarity index 93% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/RedirectController.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/RedirectController.java index 2f4950c3..9de862fd 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/RedirectController.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/RedirectController.java @@ -1,6 +1,6 @@ -package com.jmsoftware.exercisemis.universal.controller; +package com.jmsoftware.musclemis.universal.controller; -import com.jmsoftware.exercisemis.universal.configuration.ProjectProperty; +import com.jmsoftware.musclemis.universal.configuration.ProjectProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/domain/ValidationTestPayload.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/domain/ValidationTestPayload.java similarity index 89% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/domain/ValidationTestPayload.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/domain/ValidationTestPayload.java index c2908e30..1085048b 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/domain/ValidationTestPayload.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/domain/ValidationTestPayload.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.domain; +package com.jmsoftware.musclemis.universal.domain; import lombok.Data; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/filter/RequestFilter.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/filter/RequestFilter.java similarity index 95% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/filter/RequestFilter.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/filter/RequestFilter.java index b1afc38f..bc2746ee 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/filter/RequestFilter.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/filter/RequestFilter.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis.universal.filter; +package com.jmsoftware.musclemis.universal.filter; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/CommonService.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/CommonService.java similarity index 79% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/CommonService.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/CommonService.java index 42c02da2..af50c572 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/CommonService.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/CommonService.java @@ -1,6 +1,6 @@ -package com.jmsoftware.exercisemis.universal.service; +package com.jmsoftware.musclemis.universal.service; -import com.jmsoftware.exercisemis.universal.domain.ValidationTestPayload; +import com.jmsoftware.musclemis.universal.domain.ValidationTestPayload; import java.util.Map; diff --git a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/impl/CommonServiceImpl.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/impl/CommonServiceImpl.java similarity index 92% rename from muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/impl/CommonServiceImpl.java rename to muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/impl/CommonServiceImpl.java index 4dfec934..faa11c80 100644 --- a/muscle-mis/src/main/java/com/jmsoftware/exercisemis/universal/service/impl/CommonServiceImpl.java +++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/service/impl/CommonServiceImpl.java @@ -1,9 +1,9 @@ -package com.jmsoftware.exercisemis.universal.service.impl; +package com.jmsoftware.musclemis.universal.service.impl; -import com.jmsoftware.exercisemis.universal.aspect.ValidateArgument; -import com.jmsoftware.exercisemis.universal.configuration.ProjectProperty; -import com.jmsoftware.exercisemis.universal.domain.ValidationTestPayload; -import com.jmsoftware.exercisemis.universal.service.CommonService; +import com.jmsoftware.musclemis.universal.aspect.ValidateArgument; +import com.jmsoftware.musclemis.universal.configuration.ProjectProperty; +import com.jmsoftware.musclemis.universal.domain.ValidationTestPayload; +import com.jmsoftware.musclemis.universal.service.CommonService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/muscle-mis/src/test/java/com/jmsoftware/exercisemis/MuscleMisApplicationTests.java b/muscle-mis/src/test/java/com/jmsoftware/musclemis/MuscleMisApplicationTests.java similarity index 84% rename from muscle-mis/src/test/java/com/jmsoftware/exercisemis/MuscleMisApplicationTests.java rename to muscle-mis/src/test/java/com/jmsoftware/musclemis/MuscleMisApplicationTests.java index cff435ef..b2d8d426 100644 --- a/muscle-mis/src/test/java/com/jmsoftware/exercisemis/MuscleMisApplicationTests.java +++ b/muscle-mis/src/test/java/com/jmsoftware/musclemis/MuscleMisApplicationTests.java @@ -1,4 +1,4 @@ -package com.jmsoftware.exercisemis; +package com.jmsoftware.musclemis; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/ExceptionControllerAdvice.java b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/ExceptionControllerAdvice.java index 11901442..0bce62b0 100644 --- a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/ExceptionControllerAdvice.java +++ b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/ExceptionControllerAdvice.java @@ -7,6 +7,7 @@ import com.jmsoftware.common.exception.BaseException; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -124,18 +125,17 @@ public ResponseBodyBean handleException(HttpServletRequest request, */ private String getFieldErrorMessageFromException(MethodArgumentNotValidException exception) { try { - DefaultMessageSourceResolvable firstErrorField = + val firstErrorField = (DefaultMessageSourceResolvable) Objects.requireNonNull(exception.getBindingResult() .getAllErrors() .get(0) .getArguments())[0]; - String firstErrorFieldName = firstErrorField.getDefaultMessage(); - String firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - return firstErrorFieldName + " " + firstErrorFieldMessage; + val firstErrorFieldName = firstErrorField.getDefaultMessage(); + val firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + return String.format("%s %s", firstErrorFieldName, firstErrorFieldMessage); } catch (Exception e) { log.error("Exception occurred when get field error message from exception. Exception message: {}", - e.getMessage(), - e); + e.getMessage(), e); return HttpStatus.INVALID_PARAM.getMessage(); } } diff --git a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/MethodArgumentValidationAspect.java b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/MethodArgumentValidationAspect.java index e3f5c24c..ecd8fdb7 100644 --- a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/MethodArgumentValidationAspect.java +++ b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/aspect/MethodArgumentValidationAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); } diff --git a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/ExceptionControllerAdvice.java b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/ExceptionControllerAdvice.java index 4281b163..60df009e 100644 --- a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/ExceptionControllerAdvice.java +++ b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/ExceptionControllerAdvice.java @@ -7,6 +7,7 @@ import com.jmsoftware.common.exception.BaseException; import com.jmsoftware.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -124,18 +125,17 @@ public ResponseBodyBean handleException(HttpServletRequest request, */ private String getFieldErrorMessageFromException(MethodArgumentNotValidException exception) { try { - DefaultMessageSourceResolvable firstErrorField = + val firstErrorField = (DefaultMessageSourceResolvable) Objects.requireNonNull(exception.getBindingResult() .getAllErrors() .get(0) .getArguments())[0]; - String firstErrorFieldName = firstErrorField.getDefaultMessage(); - String firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - return firstErrorFieldName + " " + firstErrorFieldMessage; + val firstErrorFieldName = firstErrorField.getDefaultMessage(); + val firstErrorFieldMessage = exception.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + return String.format("%s %s", firstErrorFieldName, firstErrorFieldMessage); } catch (Exception e) { log.error("Exception occurred when get field error message from exception. Exception message: {}", - e.getMessage(), - e); + e.getMessage(), e); return HttpStatus.INVALID_PARAM.getMessage(); } } diff --git a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/MethodArgumentValidationAspect.java b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/MethodArgumentValidationAspect.java index d52d2367..1f11b786 100644 --- a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/MethodArgumentValidationAspect.java +++ b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/aspect/MethodArgumentValidationAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -41,9 +42,9 @@ public class MethodArgumentValidationAspect { private final Validator validator; public MethodArgumentValidationAspect() { - var validatorFactory = Validation.buildDefaultValidatorFactory(); + val validatorFactory = Validation.buildDefaultValidatorFactory(); this.validator = validatorFactory.getValidator(); - log.info("Validator for {} has been initiated.", this.getClass().getSimpleName()); + log.info("The validator for {} has been initiated.", this.getClass().getSimpleName()); } /** @@ -83,31 +84,31 @@ public void beforeMethodHandleArgument(JoinPoint joinPoint) { @Around("validateMethodArgumentPointcut()") public Object aroundMethodHandleArgument(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { log.info("======= METHOD'S ARGUMENT VALIDATION START ======="); - var args = proceedingJoinPoint.getArgs(); - var signature = (MethodSignature) proceedingJoinPoint.getSignature(); - var parameterAnnotations = signature.getMethod().getParameterAnnotations(); + val args = proceedingJoinPoint.getArgs(); + val signature = (MethodSignature) proceedingJoinPoint.getSignature(); + val parameterAnnotations = signature.getMethod().getParameterAnnotations(); // argumentIndexes is the array list that stores the index of argument we need to validate (the argument // annotated by `@Valid`) - var argumentIndexListThatNeedsToBeValidated = new LinkedList(); - for (var parameterAnnotation : parameterAnnotations) { - int paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); - for (var annotation : parameterAnnotation) { + val argumentIndexListThatNeedsToBeValidated = new LinkedList(); + for (val parameterAnnotation : parameterAnnotations) { + val paramIndex = ArrayUtil.indexOf(parameterAnnotations, parameterAnnotation); + for (val annotation : parameterAnnotation) { if (annotation instanceof Valid) { argumentIndexListThatNeedsToBeValidated.add(paramIndex); } } } - var errorMessageList = new LinkedList(); - for (var index : argumentIndexListThatNeedsToBeValidated) { - var constraintViolationSet = validator.validate(args[index]); + val errorMessageList = new LinkedList(); + for (val index : argumentIndexListThatNeedsToBeValidated) { + val constraintViolationSet = validator.validate(args[index]); if (CollUtil.isNotEmpty(constraintViolationSet)) { - var errorMessage = String.format("Argument validation failed: %s", + val errorMessage = String.format("Argument validation failed: %s", getAllFieldErrorMessage(constraintViolationSet)); errorMessageList.add(errorMessage); } } if (CollUtil.isNotEmpty(errorMessageList)) { - var joinedErrorMessage = StrUtil.join(", ", errorMessageList); + val joinedErrorMessage = StrUtil.join(", ", errorMessageList); log.info("Method : {}#{}", proceedingJoinPoint.getSignature().getDeclaringTypeName(), proceedingJoinPoint.getSignature().getName()); log.info("Argument : {}", args); @@ -149,8 +150,8 @@ public void afterThrowingException(JoinPoint joinPoint, Exception e) { * @return the all field error message */ private String getAllFieldErrorMessage(Set> constraintViolationSet) { - var allErrorMessageList = new LinkedList(); - for (var constraintViolation : constraintViolationSet) { + val allErrorMessageList = new LinkedList(); + for (val constraintViolation : constraintViolationSet) { allErrorMessageList.add(String.format("invalid field: %s, %s", constraintViolation.getPropertyPath(), constraintViolation.getMessage())); }