From 25bb8a6d217769a538098802ebcfffa6193e764c Mon Sep 17 00:00:00 2001 From: houwei Date: Mon, 24 Jun 2024 17:38:30 +0800 Subject: [PATCH] code cleanup --- .../common/handler/GlobalExceptionHandler.java | 15 ++++++--------- .../DecryptingOncePerRequestFilter.java | 2 +- .../java/com/das/common/log/RequestIdUtils.java | 2 +- das/src/main/java/com/das/common/result/R.java | 4 ++-- .../java/com/das/common/result/ResultCode.java | 2 +- .../com/das/common/utils/AdminRedisTemplate.java | 6 +++--- .../java/com/das/common/utils/SpringUtil.java | 9 ++++----- .../auth/service/impl/LoginServiceImpl.java | 2 +- 8 files changed, 19 insertions(+), 23 deletions(-) diff --git a/das/src/main/java/com/das/common/handler/GlobalExceptionHandler.java b/das/src/main/java/com/das/common/handler/GlobalExceptionHandler.java index 8100ef33..f86170e2 100644 --- a/das/src/main/java/com/das/common/handler/GlobalExceptionHandler.java +++ b/das/src/main/java/com/das/common/handler/GlobalExceptionHandler.java @@ -101,8 +101,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.BAD_REQUEST) public R handleValidatedException(Exception exception) { BindingResult bindingResult = null; - if (exception instanceof MethodArgumentNotValidException){ - MethodArgumentNotValidException e = (MethodArgumentNotValidException) exception; + if (exception instanceof MethodArgumentNotValidException e){ bindingResult = e.getBindingResult(); if (bindingResult.hasErrors()) { // String collect = bindingResult.getAllErrors().stream() @@ -113,14 +112,12 @@ public class GlobalExceptionHandler { return R.fail(fieldError.getField()+ "：" + fieldError.getDefaultMessage()); } } - }else if (exception instanceof ConstraintViolationException){ - ConstraintViolationException e = (ConstraintViolationException) exception; + }else if (exception instanceof ConstraintViolationException e){ String collect = e.getConstraintViolations().stream() .map(ConstraintViolation::getMessage) .collect(Collectors.joining(";")); return R.fail(collect); - }else if (exception instanceof BindException){ - BindException e = (BindException) exception; + }else if (exception instanceof BindException e){ bindingResult = e.getBindingResult(); if (bindingResult.hasErrors()) { // String collect = bindingResult.getAllErrors().stream() @@ -150,7 +147,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.BAD_REQUEST) public R handlerNullPointException(NullPointerException exception) { String message = exception.getMessage(); - log.error("全局捕获null错误信息: {}", exception.toString(), exception); + log.error("全局捕获null错误信息: {}", exception, exception); return R.fail(message); } @@ -185,7 +182,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public R handlerBindException(Exception exception) { String message = exception.getMessage(); - log.error("全局捕获错误信息: {}", exception.toString(), exception); + log.error("全局捕获错误信息: {}", exception, exception); return R.fail(message); } -} \ No newline at end of file +} diff --git a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java index afff17fe..9bec2694 100644 --- a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java +++ b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java @@ -83,7 +83,7 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { @Override public ServletInputStream getInputStream() throws IOException { - final ByteArrayInputStream bais = new ByteArrayInputStream(bodyData.getBytes("UTF-8")); + final ByteArrayInputStream bais = new ByteArrayInputStream(bodyData.getBytes(StandardCharsets.UTF_8)); return new ServletInputStream() { @Override public boolean isFinished() { diff --git a/das/src/main/java/com/das/common/log/RequestIdUtils.java b/das/src/main/java/com/das/common/log/RequestIdUtils.java index 000b4869..1f098d1f 100644 --- a/das/src/main/java/com/das/common/log/RequestIdUtils.java +++ b/das/src/main/java/com/das/common/log/RequestIdUtils.java @@ -22,7 +22,7 @@ public class RequestIdUtils { } public static UUID getRequestId() { - return (UUID)requestIdHolder.get(); + return requestIdHolder.get(); } public static void removeRequestId() { diff --git a/das/src/main/java/com/das/common/result/R.java b/das/src/main/java/com/das/common/result/R.java index 3d96ba45..ca4f1b43 100644 --- a/das/src/main/java/com/das/common/result/R.java +++ b/das/src/main/java/com/das/common/result/R.java @@ -57,7 +57,7 @@ public class R implements Serializable { } public static boolean isSuccess(@Nullable R result) { - return (Boolean) Optional.ofNullable(result).map((x) -> { + return Optional.ofNullable(result).map((x) -> { return ResultCode.SUCCESS.code == x.code; }).orElse(Boolean.FALSE); } @@ -103,7 +103,7 @@ public class R implements Serializable { } public static R fail(int code, String msg) { - return new R(code, (Object)null, msg); + return new R(code, null, msg); } public static R fail(IResultCode resultCode) { diff --git a/das/src/main/java/com/das/common/result/ResultCode.java b/das/src/main/java/com/das/common/result/ResultCode.java index da66e5cd..eaea364c 100644 --- a/das/src/main/java/com/das/common/result/ResultCode.java +++ b/das/src/main/java/com/das/common/result/ResultCode.java @@ -36,7 +36,7 @@ public enum ResultCode implements IResultCode { return this.message; } - private ResultCode(final int code, final String message) { + ResultCode(final int code, final String message) { this.code = code; this.message = message; } diff --git a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java index 3f94bd82..9b3b641f 100644 --- a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java +++ b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java @@ -93,7 +93,7 @@ public class AdminRedisTemplate { * @return */ public String randomKey() { - return (String) redisTemplate.randomKey(); + return redisTemplate.randomKey(); } /** @@ -725,7 +725,7 @@ public class AdminRedisTemplate { * @return 返回集合中多个随机数 */ public List sRandMember(String key, int count) { - return setOps.randomMembers(key, (long) count); + return setOps.randomMembers(key, count); } /** @@ -952,4 +952,4 @@ public class AdminRedisTemplate { public ZSetOperations getZSetOps() { return zSetOps; } -} \ No newline at end of file +} diff --git a/das/src/main/java/com/das/common/utils/SpringUtil.java b/das/src/main/java/com/das/common/utils/SpringUtil.java index f4029f42..cf89eef6 100644 --- a/das/src/main/java/com/das/common/utils/SpringUtil.java +++ b/das/src/main/java/com/das/common/utils/SpringUtil.java @@ -60,7 +60,7 @@ public class SpringUtil implements BeanFactoryPostProcessor, ApplicationContextA public static ListableBeanFactory getBeanFactory() { return null == beanFactory ? applicationContext : beanFactory; } - + /** * 通过name获取 Bean @@ -180,9 +180,8 @@ public class SpringUtil implements BeanFactoryPostProcessor, ApplicationContextA public static void registerBean(String beanName, T bean) { if(null != beanFactory){ beanFactory.registerSingleton(beanName, bean); - } else if(applicationContext instanceof ConfigurableApplicationContext){ - ConfigurableApplicationContext context = (ConfigurableApplicationContext) applicationContext; - context.getBeanFactory().registerSingleton(beanName, bean); + } else if(applicationContext instanceof ConfigurableApplicationContext context){ + context.getBeanFactory().registerSingleton(beanName, bean); } } -} \ No newline at end of file +} diff --git a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java index 00087049..b4717b6c 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java @@ -100,7 +100,7 @@ public class LoginServiceImpl implements LoginService { return loginInfo; } StpUtil.login(loginUserDetailsVo.getSysUser().getAccount());// 执行登录，这里username为用户唯一标识 - String newToken = StpUtil.getTokenValue().replace("-", "");; + String newToken = StpUtil.getTokenValue().replace("-", ""); String newRefreshTokenUuid = IdUtil.fastSimpleUUID(); String newRefreshToken = "refresh:" + newRefreshTokenUuid; loginInfo.setAccessToken(newToken);