optimize: First support spring:6.x and spring-boot:3.x
#5115
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wangliang181230
changed the title
spring-boot:3.xspring-boot:3.x
Codecov Report
@@ Coverage Diff @@
## develop #5115 +/- ##
=============================================
- Coverage 48.56% 48.53% -0.03%
- Complexity 4136 4139 +3
=============================================
Files 741 743 +2
Lines 26521 26544 +23
Branches 3294 3294
=============================================
+ Hits 12879 12884 +5
- Misses 12244 12261 +17
- Partials 1398 1399 +1
|
wangliang181230
requested review from
funky-eyes,
l81893521 and
slievrly
and removed request for
funky-eyes
wangliang181230
commented
Dec 5, 2022
| @@ -57,6 +57,7 @@ | |||
| <testcontainers.version>1.11.2</testcontainers.version> | |||
| <guava.version>27.0.1-jre</guava.version> | |||
| <javax-inject.version>1</javax-inject.version> | |||
| <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version> | |||
There was a problem hiding this comment.
jakarta.servlet-api 从 6.0.0 版本开始，最低要求 java11，所以最高只能使用 5.0.0 版本。
wangliang181230
commented
Dec 5, 2022
integration/http/src/main/java/io/seata/integration/http/HandlerInterceptorAdapter.java
Show resolved
Hide resolved
wangliang181230
commented
Dec 5, 2022
integration/http/src/main/java/io/seata/integration/http/HandlerInterceptorAdapter.java
Outdated
Show resolved
Hide resolved
wangliang181230
changed the title
spring-boot:3.xspring-boot:3.x and spring:6.x
wangliang181230
changed the title
spring-boot:3.x and spring:6.xspring:6.x and spring-boot:3.x
wangliang181230
changed the title
spring:6.x and spring-boot:3.xspring:6.x and spring-boot:3.x
|
|
funky-eyes
reviewed
Dec 14, 2022
integration/http/src/main/java/io/seata/integration/http/HandlerInterceptorAdapter.java
Show resolved
Hide resolved
integration/http/src/main/java/io/seata/integration/http/HandlerInterceptorAdapter.java
Outdated
Show resolved
Hide resolved
integration/http/src/main/java/io/seata/integration/http/HttpHandlerExceptionResolver.java
Outdated
Show resolved
Hide resolved
…tionPropagationInterceptor.afterCompletion(...)`.
wangliang181230
commented
Dec 14, 2022
xingfudeshi
reviewed
Dec 15, 2022
...akarta/src/main/java/io/seata/integration/http/JakartaTransactionPropagationInterceptor.java
Show resolved
Hide resolved
wangliang181230
commented
Dec 19, 2022
integration/http/src/main/java/io/seata/integration/http/HandlerInterceptorAdapter.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
optimize: First support
spring:6.xandspring-boot:3.x.优化：首次支持
spring:6.x和spring-boot:3.x。经测试，碰到的问题如下：
/META-INF/spring.factories转移到/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports。为了兼容低版本springboot，两边都加。
springboot:3.x，已将javax.servlet包 要改成jakarta.servlet包，需要jakarta.servlet-api依赖的支持。XxxxAdapter（适配器）类已不存在，自己添加相应的适配器类。所做的改造：
seata-http-jakarta模块，含JakartaSeataWebMvcConfigurer.java和JakartaTransactionPropagationInterceptor.java两个类。/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.importsHandlerInterceptorAdapter.java类，因为其功能与TransactionPropagationInterceptor.afterCompletion(...)方法重复了。test.yml添加了 基于springboot:3的自动测试job。目前，仅针对client端，做了兼容
springboot3，server端由于兼容性问题比较多，还未做过兼容。Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
请在我的测试项目中进行校验：
https://github.com/wangliang181230/study-spring-boot
Ⅴ. Special notes for reviews
代码变更比较简单，review难度不大。
基本上都是一些兼容性代码，并没有逻辑上的变动。