feat: 使用 jdk instanceof 新特性

xingyu4j
1 parent 495ef72a
Showing 7 changed files with 12 additions and 20 deletions
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/rabbitmq/TenantRabbitMQInitializer.java
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/rocketmq/TenantRocketMQInitializer.java
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoAsyncAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/framework/justauth/core/AuthRequestFactory.java
@@ -13,11 +13,10 @@ public class TenantRabbitMQInitializer implements BeanPostProcessor {
     @Override
     public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (bean instanceof RabbitTemplate) {
-            RabbitTemplate rabbitTemplate = (RabbitTemplate) bean;
+        if (bean instanceof RabbitTemplate rabbitTemplate) {
             rabbitTemplate.addBeforePublishPostProcessors(new TenantRabbitMQMessagePostProcessor());
         }
         return bean;
     }
-}
 \ No newline at end of file
+}
@@ -18,11 +18,9 @@ public class TenantRocketMQInitializer implements BeanPostProcessor {
     @Override
     public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (bean instanceof DefaultRocketMQListenerContainer) {
-            DefaultRocketMQListenerContainer container = (DefaultRocketMQListenerContainer) bean;
+        if (bean instanceof DefaultRocketMQListenerContainer container) {
             initTenantConsumer(container.getConsumer());
-        } else if (bean instanceof RocketMQTemplate) {
-            RocketMQTemplate template = (RocketMQTemplate) bean;
+        } else if (bean instanceof RocketMQTemplate template) {
             initTenantProducer(template.getProducer());
         }
         return bean;
@@ -50,4 +48,4 @@ public class TenantRocketMQInitializer implements BeanPostProcessor {
         consumerImpl.registerConsumeMessageHook(new TenantRocketMQConsumeMessageHook());
     }
-}
 \ No newline at end of file
+}
@@ -23,15 +23,13 @@ public class YudaoAsyncAutoConfiguration {
             @Override
             public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
                 // 处理 ThreadPoolTaskExecutor
-                if (bean instanceof ThreadPoolTaskExecutor) {
-                    ThreadPoolTaskExecutor executor = (ThreadPoolTaskExecutor) bean;
+                if (bean instanceof ThreadPoolTaskExecutor executor) {
                     executor.setTaskDecorator(TtlRunnable::get);
                     return executor;
                 }
                 // 处理 SimpleAsyncTaskExecutor
                 // 参考 https://t.zsxq.com/CBoks 增加
-                if (bean instanceof SimpleAsyncTaskExecutor) {
-                    SimpleAsyncTaskExecutor executor = (SimpleAsyncTaskExecutor) bean;
+                if (bean instanceof SimpleAsyncTaskExecutor executor) {
                     executor.setTaskDecorator(TtlRunnable::get);
                     return executor;
                 }
@@ -19,8 +19,7 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
-        if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) {
-            BaseDO baseDO = (BaseDO) metaObject.getOriginalObject();
+        if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO baseDO) {
             LocalDateTime current = LocalDateTime.now();
             // 创建时间为空，则以当前时间为插入时间
@@ -184,8 +184,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(HttpMessageNotReadableException.class)
     public CommonResult<?> methodArgumentTypeInvalidFormatExceptionHandler(HttpMessageNotReadableException ex) {
         log.warn("[methodArgumentTypeInvalidFormatExceptionHandler]", ex);
-        if (ex.getCause() instanceof InvalidFormatException) {
-            InvalidFormatException invalidFormatException = (InvalidFormatException) ex.getCause();
+        if (ex.getCause() instanceof InvalidFormatException invalidFormatException) {
             return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数类型错误:%s", invalidFormatException.getValue()));
         }
         if (StrUtil.startWith(ex.getMessage(), "Required request body is missing")) {
@@ -146,10 +146,9 @@ public class WebFrameworkUtils {
     public static HttpServletRequest getRequest() {
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (!(requestAttributes instanceof ServletRequestAttributes)) {
+        if (!(requestAttributes instanceof ServletRequestAttributes servletRequestAttributes)) {
             return null;
         }
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
         return servletRequestAttributes.getRequest();
     }
@@ -77,8 +77,8 @@ public class AuthRequestFactory {
             extendList = extend.getConfig()
                     .keySet()
                     .stream()
-                    .filter(x -> names.contains(x.toUpperCase()))
                     .map(String::toUpperCase)
+                    .filter(names::contains)
                     .collect(Collectors.toList());
         }
@@ -318,4 +318,4 @@ public class AuthRequestFactory {
                 .proxy(new Proxy(Proxy.Type.valueOf(proxyConfig.getType()), new InetSocketAddress(proxyConfig.getHostname(), proxyConfig.getPort())))
                 .build());
     }
-}
 \ No newline at end of file
+}