From c0a93a5e1dbad7fdb2da7b50c196d79d449086db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=97=B4=E5=B0=8F=E4=B9=99?= Date: Mon, 21 Aug 2023 22:37:01 +0800 Subject: [PATCH] feat: :sparkles: up java17, springboot 3 --- bubble-core/pom.xml | 4 +- .../fxbin/bubble/core/model/PageRequest.java | 4 +- .../cn/fxbin/bubble/core/util/WebUtils.java | 14 +- bubble-dependencies/pom.xml | 8 +- .../main/resources/META-INF/spring.factories | 3 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + ...t.autoconfigure.AutoConfiguration.imports} | 4 +- ...t.autoconfigure.AutoConfiguration.imports} | 4 +- .../DynamicThreadPoolAutoConfiguration.java | 4 +- .../endpoint/ThreadPoolEndpoint.java | 2 +- .../listener/ConfigServerHandler.java | 2 +- ...t.autoconfigure.AutoConfiguration.imports} | 4 +- .../bubble/plugin/excel/util/ExcelUtils.java | 4 +- .../bubble/i18n/I18nAutoConfiguration.java | 2 +- .../bubble/i18n/I18nMessageProvider.java | 2 +- .../plugin/lock/factory/LockFactory.java | 2 +- .../plugin/lock/support/LockActionAspect.java | 2 +- ...t.autoconfigure.AutoConfiguration.imports} | 4 +- .../pom.xml | 9 +- .../logging/TtlMDCAdapterInitializer.java | 22 -- .../logging/aspect/LoggingWebAspect.java | 6 +- .../AliyunLogContextAutoConfigure.java | 2 +- .../event/runner/LoggingNoticeRunner.java | 2 +- .../logging/report/AliyunLoggingReport.java | 2 +- .../report/LoggingReportScheduled.java | 2 +- .../main/java/org/slf4j/TtlMDCAdapter.java | 191 ------------------ .../main/resources/META-INF/spring.factories | 7 - ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../FeignGlobalConfiguration.java | 2 +- .../FeignInterceptorConfiguration.java | 4 +- .../handler/CustomizeUrlBlockHandler.java | 4 +- ...t.autoconfigure.AutoConfiguration.imports} | 4 +- .../autoconfigure/TokenAutoConfiguration.java | 2 +- .../main/resources/META-INF/spring.factories | 3 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../DefaultGlobalExceptionHandler.java | 4 +- .../bubble/web/servlet/BaseController.java | 6 +- .../web/servlet/DefaultErrorController.java | 2 +- .../wrapper/ContentCachingRequestWrapper.java | 8 +- .../servlet/wrapper/HeaderRequestWrapper.java | 4 +- .../bubble/web/validator/EqualField.java | 4 +- .../web/validator/EqualFieldValidator.java | 6 +- ...t.autoconfigure.AutoConfiguration.imports} | 8 +- .../main/resources/META-INF/spring.factories | 3 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../main/resources/META-INF/spring.factories | 3 - ...ot.autoconfigure.AutoConfiguration.imports | 1 + pom.xml | 4 +- 48 files changed, 76 insertions(+), 313 deletions(-) delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring.factories create mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (58%) rename bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (58%) rename bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (58%) rename bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (58%) delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/TtlMDCAdapterInitializer.java delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/org/slf4j/TtlMDCAdapter.java delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring.factories create mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (58%) delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring.factories create mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (53%) delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring.factories create mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring.factories create mode 100644 bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/bubble-core/pom.xml b/bubble-core/pom.xml index e302412f..7fe71a37 100644 --- a/bubble-core/pom.xml +++ b/bubble-core/pom.xml @@ -20,8 +20,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api diff --git a/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageRequest.java b/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageRequest.java index 1c6f4f06..26f7bb0a 100644 --- a/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageRequest.java +++ b/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageRequest.java @@ -7,8 +7,8 @@ import lombok.ToString; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/bubble-core/src/main/java/cn/fxbin/bubble/core/util/WebUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/core/util/WebUtils.java index 219a8521..dec38133 100644 --- a/bubble-core/src/main/java/cn/fxbin/bubble/core/util/WebUtils.java +++ b/bubble-core/src/main/java/cn/fxbin/bubble/core/util/WebUtils.java @@ -7,9 +7,9 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.NetworkInterface; @@ -51,11 +51,11 @@ public class WebUtils extends org.springframework.web.util.WebUtils { * getRequest * *

- * get javax.servlet.http.HttpServletRequest instance + * get jakarta.servlet.http.HttpServletRequest instance *

* * @since 2020/4/13 17:32 - * @return javax.servlet.http.HttpServletRequest + * @return jakarta.servlet.http.HttpServletRequest */ public HttpServletRequest getRequest() { return Optional.ofNullable(RequestContextHolder.getRequestAttributes()) @@ -141,11 +141,11 @@ public Map getRequestHeaders(HttpServletRequest request) { * getResponse * *

- * get javax.servlet.http.HttpServletResponse instance + * get jakarta.servlet.http.HttpServletResponse instance *

* * @since 2020/4/13 17:31 - * @return javax.servlet.http.HttpServletResponse + * @return jakarta.servlet.http.HttpServletResponse */ public HttpServletResponse getResponse() { return Optional.ofNullable(RequestContextHolder.getRequestAttributes()) diff --git a/bubble-dependencies/pom.xml b/bubble-dependencies/pom.xml index 3d3d76d0..c0c487b2 100644 --- a/bubble-dependencies/pom.xml +++ b/bubble-dependencies/pom.xml @@ -15,10 +15,10 @@ - 2.7.14 - 2021.0.8 - 2021.0.5.0 - 2.7.10 + 3.1.2 + 2022.0.4 + 2022.0.0.0 + 3.1.5 3.0.3 diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 4653510f..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.data.elasticsearch.autoconfigure.ElasticsearchAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..f1ad97e6 --- /dev/null +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fxbin.bubble.data.elasticsearch.autoconfigure.ElasticsearchAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 58% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e8fe6c3b..a7f921bc 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.data.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration,\ +cn.fxbin.bubble.data.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration cn.fxbin.bubble.data.mybatisplus.autoconfigure.DataSourceConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 58% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ec5d14df..15b4dea1 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.data.redis.autoconfigure.RedisTemplateAutoConfiguration,\ +cn.fxbin.bubble.data.redis.autoconfigure.RedisTemplateAutoConfiguration cn.fxbin.bubble.data.redis.autoconfigure.SessionAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/DynamicThreadPoolAutoConfiguration.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/DynamicThreadPoolAutoConfiguration.java index 600f61cc..605ed924 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/DynamicThreadPoolAutoConfiguration.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/DynamicThreadPoolAutoConfiguration.java @@ -23,8 +23,8 @@ import org.springframework.context.event.EventListener; import org.springframework.core.env.Environment; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; import java.util.Map; import java.util.Optional; import java.util.concurrent.BlockingQueue; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/endpoint/ThreadPoolEndpoint.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/endpoint/ThreadPoolEndpoint.java index 95a01e90..9b5653fd 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/endpoint/ThreadPoolEndpoint.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/endpoint/ThreadPoolEndpoint.java @@ -9,7 +9,7 @@ import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/listener/ConfigServerHandler.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/listener/ConfigServerHandler.java index b7d66bfd..9d5102a6 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/listener/ConfigServerHandler.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/listener/ConfigServerHandler.java @@ -7,7 +7,7 @@ import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.PropertySource; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 58% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 39645054..351ad498 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.plugin.dynamic.threadpool.autoconfigure.DynamicThreadPoolAutoConfiguration,\ +cn.fxbin.bubble.plugin.dynamic.threadpool.autoconfigure.DynamicThreadPoolAutoConfiguration cn.fxbin.bubble.plugin.dynamic.threadpool.autoconfigure.ConfigServerRefreshAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-excel/src/main/java/cn/fxbin/bubble/plugin/excel/util/ExcelUtils.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-excel/src/main/java/cn/fxbin/bubble/plugin/excel/util/ExcelUtils.java index 70fce290..79f80fa0 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-excel/src/main/java/cn/fxbin/bubble/plugin/excel/util/ExcelUtils.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-excel/src/main/java/cn/fxbin/bubble/plugin/excel/util/ExcelUtils.java @@ -6,7 +6,7 @@ import org.springframework.http.MediaType; import org.springframework.web.util.UriUtils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** @@ -25,7 +25,7 @@ public class ExcelUtils { * setResponse * * @since 2020/4/7 16:13 - * @param response javax.servlet.http.HttpServletResponse + * @param response jakarta.servlet.http.HttpServletResponse * @param fileName excel file name */ public void setResponse(HttpServletResponse response, String fileName) { diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nAutoConfiguration.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nAutoConfiguration.java index 31270f92..dfb3d1af 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nAutoConfiguration.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.web.servlet.i18n.CookieLocaleResolver; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nMessageProvider.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nMessageProvider.java index a9c5cfa0..e6c36a9d 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nMessageProvider.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nMessageProvider.java @@ -4,7 +4,7 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Locale; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/factory/LockFactory.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/factory/LockFactory.java index 2ca16c3d..1a6a02ac 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/factory/LockFactory.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/factory/LockFactory.java @@ -7,7 +7,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * LockFactory diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/support/LockActionAspect.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/support/LockActionAspect.java index 86281f5a..a2e8f4ff 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/support/LockActionAspect.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/support/LockActionAspect.java @@ -20,7 +20,7 @@ import org.springframework.core.annotation.Order; import org.springframework.util.Assert; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.lang.reflect.Method; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 58% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 38c4397a..354fd873 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.plugin.lock.autoconfigure.RedissonAutoConfiguration,\ +cn.fxbin.bubble.plugin.lock.autoconfigure.RedissonAutoConfiguration cn.fxbin.bubble.plugin.lock.autoconfigure.LockAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/pom.xml b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/pom.xml index 2768228e..5f032fd7 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/pom.xml +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/pom.xml @@ -29,12 +29,13 @@ - com.alibaba - transmittable-thread-local + org.springframework.boot + spring-boot-starter-aop + - org.springframework.cloud - spring-cloud-starter-sleuth + com.alibaba + transmittable-thread-local diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/TtlMDCAdapterInitializer.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/TtlMDCAdapterInitializer.java deleted file mode 100644 index 30b6153b..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/TtlMDCAdapterInitializer.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.fxbin.bubble.plugin.logging; - -import org.slf4j.TtlMDCAdapter; -import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.ConfigurableApplicationContext; - -/** - * TtlMDCAdapterInitializer - * 初始化TtlMDCAdapter实例，并替换MDC 中的adapter 对象 - * - * @author fxbin - * @version v1.0 - * @since 2020/4/22 16:13 - */ -@SuppressWarnings("ResultOfMethodCallIgnored") -public class TtlMDCAdapterInitializer implements ApplicationContextInitializer { - @Override - public void initialize(ConfigurableApplicationContext applicationContext) { - // 加载TtlMDCAdapter 实例 - TtlMDCAdapter.getTtlMDCAdapter(); - } -} diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/aspect/LoggingWebAspect.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/aspect/LoggingWebAspect.java index 7a899caa..a8b7baaf 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/aspect/LoggingWebAspect.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/aspect/LoggingWebAspect.java @@ -17,9 +17,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.ApplicationEventPublisher; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.concurrent.TimeUnit; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/autoconfigure/AliyunLogContextAutoConfigure.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/autoconfigure/AliyunLogContextAutoConfigure.java index 0802f41e..7c2a47bd 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/autoconfigure/AliyunLogContextAutoConfigure.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/autoconfigure/AliyunLogContextAutoConfigure.java @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * AliyunLogContext diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/event/runner/LoggingNoticeRunner.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/event/runner/LoggingNoticeRunner.java index 87f3d910..477f9211 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/event/runner/LoggingNoticeRunner.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/event/runner/LoggingNoticeRunner.java @@ -12,7 +12,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Collections; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/AliyunLoggingReport.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/AliyunLoggingReport.java index 1e5d0294..6534e9a8 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/AliyunLoggingReport.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/AliyunLoggingReport.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/LoggingReportScheduled.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/LoggingReportScheduled.java index e118e880..5a14755b 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/LoggingReportScheduled.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/LoggingReportScheduled.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/org/slf4j/TtlMDCAdapter.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/org/slf4j/TtlMDCAdapter.java deleted file mode 100644 index 2c1d48df..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/org/slf4j/TtlMDCAdapter.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.slf4j; - -import ch.qos.logback.classic.util.LogbackMDCAdapter; -import com.alibaba.ttl.TransmittableThreadLocal; -import org.slf4j.spi.MDCAdapter; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * TtlMDCAdapter - * - *

- * 参考 ch.qos.logback.classic.util.LogbackMDCAdapter 的实现，仅替换了ThreadLocal 的创建 - *

- * - * @author fxbin - * @version v1.0 - * @since 2020/4/22 15:36 - * @see LogbackMDCAdapter - */ -public class TtlMDCAdapter implements MDCAdapter { - - // The internal map is copied so as - private static final ThreadLocal> copyOnThreadLocal = new TransmittableThreadLocal<>(); - - private static final int WRITE_OPERATION = 1; - private static final int MAP_COPY_OPERATION = 2; - - private static TtlMDCAdapter ttlMDCAdapter; - - // keeps track of the last operation performed - final ThreadLocal lastOperation = new ThreadLocal<>(); - - static { - ttlMDCAdapter = new TtlMDCAdapter(); - MDC.mdcAdapter = ttlMDCAdapter; - } - - public static TtlMDCAdapter getTtlMDCAdapter() { - return ttlMDCAdapter; - } - - private Integer getAndSetLastOperation(int op) { - Integer lastOp = lastOperation.get(); - lastOperation.set(op); - return lastOp; - } - - private boolean wasLastOpReadOrNull(Integer lastOp) { - return lastOp == null || lastOp.intValue() == MAP_COPY_OPERATION; - } - - private Map duplicateAndInsertNewMap(Map oldMap) { - Map newMap = Collections.synchronizedMap(new HashMap()); - if (oldMap != null) { - // we don't want the parent thread modifying oldMap while we are - // iterating over it - synchronized (oldMap) { - newMap.putAll(oldMap); - } - } - - copyOnThreadLocal.set(newMap); - return newMap; - } - - /** - * Put a context value (the val parameter) as identified with the - * key parameter into the current thread's context map. Note that - * contrary to log4j, the val parameter can be null. - *

- *

- * If the current thread does not have a context map it is created as a side - * effect of this call. - * - * @throws IllegalArgumentException in case the "key" parameter is null - */ - @Override - public void put(String key, String val) throws IllegalArgumentException { - if (key == null) { - throw new IllegalArgumentException("key cannot be null"); - } - - Map oldMap = copyOnThreadLocal.get(); - Integer lastOp = getAndSetLastOperation(WRITE_OPERATION); - - if (wasLastOpReadOrNull(lastOp) || oldMap == null) { - Map newMap = duplicateAndInsertNewMap(oldMap); - newMap.put(key, val); - } else { - oldMap.put(key, val); - } - } - - /** - * Remove the the context identified by the key parameter. - *

- */ - @Override - public void remove(String key) { - if (key == null) { - return; - } - Map oldMap = copyOnThreadLocal.get(); - if (oldMap == null) - return; - - Integer lastOp = getAndSetLastOperation(WRITE_OPERATION); - - if (wasLastOpReadOrNull(lastOp)) { - Map newMap = duplicateAndInsertNewMap(oldMap); - newMap.remove(key); - } else { - oldMap.remove(key); - } - } - - /** - * Clear all entries in the MDC. - */ - @Override - public void clear() { - lastOperation.set(WRITE_OPERATION); - copyOnThreadLocal.remove(); - } - - /** - * Get the context identified by the key parameter. - *

- */ - @Override - public String get(String key) { - final Map map = copyOnThreadLocal.get(); - if ((map != null) && (key != null)) { - return map.get(key); - } else { - return null; - } - } - - /** - * Get the current thread's MDC as a map. This method is intended to be used - * internally. - */ - public Map getPropertyMap() { - lastOperation.set(MAP_COPY_OPERATION); - return copyOnThreadLocal.get(); - } - - /** - * Returns the keys in the MDC as a {@link Set}. The returned value can be - * null. - */ - public Set getKeys() { - Map map = getPropertyMap(); - - if (map != null) { - return map.keySet(); - } else { - return null; - } - } - - /** - * Return a copy of the current thread's context map. Returned value may be - * null. - */ - @Override - public Map getCopyOfContextMap() { - Map hashMap = copyOnThreadLocal.get(); - if (hashMap == null) { - return null; - } else { - return new HashMap(hashMap); - } - } - - @Override - public void setContextMap(Map contextMap) { - lastOperation.set(WRITE_OPERATION); - - Map newMap = Collections.synchronizedMap(new HashMap()); - newMap.putAll(contextMap); - - // the newMap replaces the old one for serialisation's sake - copyOnThreadLocal.set(newMap); - } -} diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 3a034fed..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,7 +0,0 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.plugin.logging.autoconfigure.LoggingAutoConfiguration,\ -cn.fxbin.bubble.plugin.logging.autoconfigure.AliyunLogContextAutoConfigure - -org.springframework.context.ApplicationContextInitializer=\ -cn.fxbin.bubble.plugin.logging.TtlMDCAdapterInitializer \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..a351ff3e --- /dev/null +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fxbin.bubble.plugin.logging.autoconfigure.LoggingAutoConfiguration +cn.fxbin.bubble.plugin.logging.autoconfigure.AliyunLogContextAutoConfigure \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignGlobalConfiguration.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignGlobalConfiguration.java index 81a7bf4a..c9a8e2eb 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignGlobalConfiguration.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignGlobalConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.concurrent.TimeUnit; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignInterceptorConfiguration.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignInterceptorConfiguration.java index b5dccb71..f30d5ac1 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignInterceptorConfiguration.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/autoconfigure/FeignInterceptorConfiguration.java @@ -14,8 +14,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Enumeration; import java.util.List; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/handler/CustomizeUrlBlockHandler.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/handler/CustomizeUrlBlockHandler.java index db3651f5..4557c596 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/handler/CustomizeUrlBlockHandler.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/java/cn/fxbin/bubble/openfeign/handler/CustomizeUrlBlockHandler.java @@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * CustomUrlBlockHandler diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 58% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ad15cbdb..15155f88 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-openfeign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.openfeign.autoconfigure.FeignInterceptorConfiguration,\ +cn.fxbin.bubble.openfeign.autoconfigure.FeignInterceptorConfiguration cn.fxbin.bubble.openfeign.autoconfigure.FeignGlobalConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/java/cn/fxbin/bubble/plugin/token/autoconfigure/TokenAutoConfiguration.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/java/cn/fxbin/bubble/plugin/token/autoconfigure/TokenAutoConfiguration.java index 84a97b85..1da769d6 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/java/cn/fxbin/bubble/plugin/token/autoconfigure/TokenAutoConfiguration.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/java/cn/fxbin/bubble/plugin/token/autoconfigure/TokenAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * TokenAutoConfiguration diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 5133563e..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.plugin.token.autoconfigure.TokenAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..cad6ab4e --- /dev/null +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-token/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fxbin.bubble.plugin.token.autoconfigure.TokenAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java index f939ab4a..3ab65289 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/handler/DefaultGlobalExceptionHandler.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import java.util.List; import java.util.stream.Collectors; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/BaseController.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/BaseController.java index c9c152c5..f9b6511f 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/BaseController.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/BaseController.java @@ -5,9 +5,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.lang.Nullable; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * BaseController diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/DefaultErrorController.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/DefaultErrorController.java index 885806ce..6be957b4 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/DefaultErrorController.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/DefaultErrorController.java @@ -10,7 +10,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/ContentCachingRequestWrapper.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/ContentCachingRequestWrapper.java index d5adcdba..80545ac2 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/ContentCachingRequestWrapper.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/ContentCachingRequestWrapper.java @@ -3,10 +3,10 @@ import cn.fxbin.bubble.core.util.IoUtils; import lombok.SneakyThrows; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/HeaderRequestWrapper.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/HeaderRequestWrapper.java index 5a72de1a..0d389995 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/HeaderRequestWrapper.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/servlet/wrapper/HeaderRequestWrapper.java @@ -2,8 +2,8 @@ import com.google.common.collect.Maps; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.util.Collections; import java.util.Enumeration; import java.util.List; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualField.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualField.java index 7a6d7854..6c102c6b 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualField.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualField.java @@ -1,7 +1,7 @@ package cn.fxbin.bubble.web.validator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualFieldValidator.java b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualFieldValidator.java index 4b8cad06..9e4c4e2e 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualFieldValidator.java +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/java/cn/fxbin/bubble/web/validator/EqualFieldValidator.java @@ -3,9 +3,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.util.ReflectionUtils; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.ValidationException; import java.lang.reflect.Field; /** diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 53% rename from bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring.factories rename to bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 86068313..cfff373a 100644 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring.factories +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,4 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.web.autoconfigure.GlobalHandlerAutoConfiguration,\ -cn.fxbin.bubble.web.autoconfigure.RestTemplateAutoConfiguration,\ -cn.fxbin.bubble.web.autoconfigure.jackson.CustomizeJacksonAutoConfiguration,\ +cn.fxbin.bubble.web.autoconfigure.GlobalHandlerAutoConfiguration +cn.fxbin.bubble.web.autoconfigure.RestTemplateAutoConfiguration +cn.fxbin.bubble.web.autoconfigure.jackson.CustomizeJacksonAutoConfiguration cn.fxbin.bubble.web.autoconfigure.CustomizeWebAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 62a6e8c2..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.plugin.xxl.job.autofigure.XxlJobAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..5b2a1642 --- /dev/null +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fxbin.bubble.plugin.xxl.job.autofigure.XxlJobAutoConfiguration \ No newline at end of file diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring.factories b/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index debc51e3..00000000 --- a/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -## Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.fxbin.bubble.lanuch.StartedEventListener diff --git a/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..accf6363 --- /dev/null +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fxbin.bubble.lanuch.StartedEventListener \ No newline at end of file diff --git a/pom.xml b/pom.xml index dc78a74b..5de60e99 100644 --- a/pom.xml +++ b/pom.xml @@ -82,9 +82,9 @@ - java11 + java17 - [11,) + [17,)