Add Spring Boot 3 integration modules #4574

ikhoon · 2022-12-14T16:18:16Z

Motivation:

Spring 6 and Spring Boot 3 have been released.
https://spring.io/blog/2022/11/24/spring-boot-3-0-goes-ga

Modifications:

New modules are added:
- spring-boot3-{autoconfigure,starter}
- spring-boot3-actuator-{autoconfigure,starter}
- spring-boot3-webflux-{autoconfigure,starter}
- tomcat10
Use Java 17 for Spring Boot 3 module, Spring examples and integration tests.
Use Java 11 for Tomcat 10 module.
Migrate removed or changed API
- Use Jakarta EE 9 APIs (jakarta.*) instead of EE 8 (javax.*).
- Add PortUtil and migrate off SocketUtils.
- Migrate AutoConfiguration in META-INF/spring.factories to o.s.b.a.AutoConfiguration.imports. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#new-autoconfiguration-annotation
- Change management.metrics.export.defaults.enabled to management.promethus.metrics.export.enabled in tests Move metrics export properties spring-projects/spring-boot#30381
- Fix compile errors in the Webflux integration
  - AbstractServerHttpRequest.getMethod() became non-default method.
- Migrate relocated LocalServerPort and LocalManagementPort.
  - org.springframework.boot.web.server.LocalServerPort -> org.springframework.boot.test.web.server.LocalServerPort

Dependencies:

Add Spring Boot 3.0.2
Add hibernate-validator 8.0.0
Bump Micrometer into 1.10.2
Add Jakarta dependencies
- jakarta-inject 2.0.1
- jakarta-validation 3.0.2
- jakarta-websocket 2.1.0

Result:

You can now use Spring Boot 3 with Armeria.

Motivation: Spring 6 and Spring Boot 3 have been released. https://spring.io/blog/2022/11/24/spring-boot-3-0-goes-ga Note that the added modules will not be published until we refactor `spring-boot2-autoconfigure` internals. Modifications: - Add Spring Boot 3 integrations symmetirically with Spring Boot 2. - `publish` flags are not added intentionally. - Set the release target for Spring Boot 3 and examples to Java 17. - Add `PortUtil` and migrate off `SocketUtils`. - Migrate AutoConfiguration in spring.factories to `o.s.b.a.AutoConfiguration.imports`. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#new-autoconfiguration-annotation - Change `management.metrics.export.defaults.enabled` to `management.promethus.metrics.export.enabled` in tests spring-projects/spring-boot#30381 - Fix compile errors in the webflux integration - Migrate moved `LocalServerPort` and `LocalManagementPort`. Depedencies: - Add Spring Boot 3.0.0 - Add `hibernate-validator 8.0.0 - Bump Micrometer into 1.10.2 - Add Jakarta dependencies - jakarta-inject 2.0.1 - jakarta-validation 3.0.2 - jakarta-websocket 2.1.0 Result: Experimentally set up Spring Boot 3 integrations.

...nfigure/src/main/java/com/linecorp/armeria/spring/web/reactive/ArmeriaServerHttpRequest.java

zookeeper3/src/test/java/com/linecorp/armeria/common/zookeeper/ZooKeeperTestUtilTest.java

…/ZooKeeperTestUtilTest.java

…armeria/spring/web/reactive/ArmeriaServerHttpRequest.java

…boot3

This reverts commit a51f97e.

…ration

ikhoon · 2023-02-06T14:48:00Z

Rescheduled the milestone to 1.23.0

cj848 · 2023-02-15T11:07:41Z

When can this PR be merged? This is a very much awaited PR.

minwoox

Excellent work! 👍 👍 👍
Left nits and questions.

core/src/main/java/com/linecorp/armeria/internal/common/util/PortUtil.java

core/src/test/java/com/linecorp/armeria/internal/common/util/PortUtilTest.java

gradle/scripts/lib/java.gradle

...webflux-security/src/test/java/com/linecorp/armeria/spring/security/SecureConfiguration.java

...java/com/linecorp/armeria/spring/web/reactive/AbstractServerHttpResponseVersionSpecific.java

...figure/src/main/java/com/linecorp/armeria/spring/web/reactive/ArmeriaServerHttpResponse.java

spring/boot3-actuator-autoconfigure/build.gradle

minwoox · 2023-02-16T07:39:18Z

spring/boot3-webflux-autoconfigure/build.gradle

+    api libs.jakarta.inject
+    compileOnly libs.jakarta.validation
+    // We may remove jakarta.websocket dependencies if Armeria webflux module supports WebSocket.
+    implementation libs.jakarta.websocket


I'm not sure if we need this or not. Shouldn't the user who wants to use WebSocket include this dependency?

https://github.com/spring-projects/spring-framework/blob/main/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java#L272-L291
WebFlux in Spring Boot 3 uses Jakarta Websocket as a fallback if no custom WebSocket RequestUpgradeStrategy is detected. The explanation was not enough. Let me update the comment.

Thanks a lot for the explanation. 🙇

zookeeper3/src/test/java/com/linecorp/armeria/common/zookeeper/ZooKeeperTestUtilTest.java

minwoox · 2023-02-16T07:59:02Z

When can this PR be merged? This is a very much awaited PR.

Sorry about the delay. 😓
I think this is almost done and I hope we could include this in the next release. Please stay tuned. 🙇

core/src/test/java/com/linecorp/armeria/internal/common/util/PortUtilTest.java

spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml

zookeeper3/src/test/java/com/linecorp/armeria/common/zookeeper/ZooKeeperTestUtil.java

jrhee17

Left only nits and questions 😄 Thanks for the handling this issue @ikhoon 🙇

gradle.properties

gradle/scripts/lib/java.gradle

core/src/main/java/com/linecorp/armeria/internal/common/util/PortUtil.java

spring/boot2-autoconfigure/build.gradle

jrhee17 · 2023-03-17T15:21:04Z

spring/boot3-autoconfigure/src/test/resources/config/application-autoConfTest.yml

@@ -4,6 +4,11 @@ management:
      prometheus:
        enabled: true # In order to inject PrometheusMeterRegistry

+  prometheus:


I understood that

spring-boot 1,2: management.metrics.export.prometheus.enabled

spring-boot 3: prometheus.metrics.export.enabled

Which is why both are added. Am I understanding correctly?

Yes, I put both properties to share this configuration file. We can check out the change properties in
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0.0-Configuration-Changelog

- management.metrics.export.prometheus.enabled + management.prometheus.metrics.export.enabled

jrhee17 · 2023-03-17T15:59:09Z

...igure/src/main/java/com/linecorp/armeria/spring/web/reactive/AbstractServerHttpResponse.java

+                        // called. It can lead to
+                        // leaking of the buffer when an
+                        // HttpResponse is canceled.
+                        return writeWithInternal(Mono.just(buffer).doOnSubscribe(s -> subscribed.set(true))


Do you have plans to file an issue/fix upstream also? If I understand correctly this also affects upstream. Having it fixed there would simplify code from our side a lot.

If I understand correctly this also affects upstream.

It might be a problem only on our side. If we didn't recover the CancelledSubscriptionException exception,
https://github.com/line/armeria/blob/master/spring/boot3-webflux-autoconfigure/src/main/java/com/linecorp/armeria/spring/web/reactive/ArmeriaServerHttpResponse.java#L93-L95
the buffer would be released by

armeria/spring/boot3-webflux-autoconfigure/src/main/java/com/linecorp/armeria/spring/web/reactive/AbstractServerHttpResponse.java

Line 187 in 96ee8e8

}).doOnError(ex -> DataBufferUtils.release(buffer)).doOnCancel(() -> {

Anyway, it would be worth discussing it with upstream maintainers. Let me create an issue for it.

spring/boot3-autoconfigure/src/test/resources/config/application-settings.yml

jrhee17 · 2023-03-17T16:07:47Z

tomcat9/build.gradle

+}
+
+tasks.compileJava.dependsOn(generateSources)
+


Question) Is there no need for compileTestJava to depend on generateSources (or compileJava)?
I realize that this is just a copy of tomcat8, but this seemed odd 🤔

IIUC, compileTestJava depends compileJava by the Java Plugin.
https://docs.gradle.org/current/userguide/java_plugin.html
So we don't need an additional dependency for them.

./gradlew :tomcat9:compileTestJava --dry-run :core:compileJava SKIPPED :junit4:copyJunitSources SKIPPED :junit4:generateSources SKIPPED :junit4:compileJava SKIPPED :junit5:compileJava SKIPPED :testing-internal:compileJava SKIPPED :tomcat9:generateSources SKIPPED :tomcat9:compileJava SKIPPED :tomcat9:versionProperties SKIPPED :tomcat9:processResources SKIPPED :tomcat9:classes SKIPPED :tomcat9:compileTestJava SKIPPED

trustin

LGTM once the conflicts are resolved. Thanks for adding this long-awaited module!

minwoox

Great job, @ikhoon!
Thanks a lot! 😄

jrhee17

Looks really nice! Thanks @ikhoon ! 👍 🚀 🙇

ikhoon · 2023-03-28T07:51:04Z

Thanks for the review. I missed pushing some changes that should be checked in before the final review. 224489a (#4574) The changes are trivial ones related to Jacoco and Javadoc.

jrhee17

Still looks good 👍

trustin

Still LGTM 🚀

Motivation: Spring Boot 3 has been released and we added new modules for Spring Boot 3 line#4574. Spring also stopped support for Spring Boot 1 a long time ago. https://spring.io/blog/2018/07/30/spring-boot-1-x-eol-aug-1st-2019 See line#4651 for the details Modifications: - Remove `boot1-autoconfigure` and `boot1-starter` modules Result: - You no longer use Spring 1 integration with the lastet Armeria version. - Closes line#4651

Motivation: Spring Boot 3 has been released and we added new modules for Spring Boot 3 #4574. Spring also stopped support for Spring Boot 1 a long time ago. https://spring.io/blog/2018/07/30/spring-boot-1-x-eol-aug-1st-2019 See #4651 for the details Modifications: - Remove `boot1-autoconfigure` and `boot1-starter` modules Result: - You no longer use Spring 1 integration with the latest Armeria version. - Closes #4651

ikhoon added new feature dependencies labels Dec 14, 2022

ikhoon added this to the 1.21.0 milestone Dec 14, 2022

ikhoon requested review from jrhee17, minwoox and trustin as code owners December 14, 2022 16:18

ikhoon commented Dec 14, 2022

View reviewed changes

...nfigure/src/main/java/com/linecorp/armeria/spring/web/reactive/ArmeriaServerHttpRequest.java Outdated Show resolved Hide resolved

zookeeper3/src/test/java/com/linecorp/armeria/common/zookeeper/ZooKeeperTestUtilTest.java Outdated Show resolved Hide resolved

ikhoon added 5 commits December 15, 2022 01:28

Update zookeeper3/src/test/java/com/linecorp/armeria/common/zookeeper…

08084dd

…/ZooKeeperTestUtilTest.java

Update spring/boot3-webflux-autoconfigure/src/main/java/com/linecorp/…

ba72138

…armeria/spring/web/reactive/ArmeriaServerHttpRequest.java

Move jakarta websocket to runtime dependency

cf04ebe

Merge branch 'spring-boot3' of github.com:ikhoon/armeria into spring-…

af4b16c

…boot3

Add Tomcat 10 module

41dc312

ikhoon modified the milestones: 1.21.0, 1.22.0 Dec 15, 2022

ikhoon marked this pull request as draft December 15, 2022 12:41

ikhoon and others added 9 commits December 20, 2022 11:21

Bump Reactor version to 3.5.1

4d2be6a

Merge branch 'master' into spring-boot3

fef981c

Fix Kotlin jvm-target

3407af9

Do not copy ByteBufLeakTest

2bb2eea

Exclude duplicate class from Jacoco report

c8b2358

no_aggregation and DirtyContexts

6437c5b

Correctly set javac release

9758e53

Require 11 for Tomcat 10

2dcb5ec

Copy all files in META-INF/spring

5fd59ce

ikhoon marked this pull request as ready for review January 25, 2023 12:19

ikhoon added 2 commits January 25, 2023 21:36

Try to revert a workaround

a51f97e

Revert "Try to revert a workaround"

28f7428

This reverts commit a51f97e.

ikhoon mentioned this pull request Jan 30, 2023

Support address, base-path and ssl.enabled of ManagementServerProperties #4563

Merged

Fork AbstractServerHttpResponse to fix a buffer leak in WebFlux integ…

b780234

…ration

ikhoon mentioned this pull request Feb 4, 2023

Stop support for Spring Boot 1 #4651

Closed

ikhoon added 2 commits February 5, 2023 00:53

Fix compile error

a0788f6

checkstyle

96ee8e8

ikhoon modified the milestones: 1.22.0, 1.23.0 Feb 6, 2023

minwoox reviewed Feb 16, 2023

View reviewed changes

trustin reviewed Mar 8, 2023

View reviewed changes

Address comments by @minwoox and @trustin

783a5c9

jrhee17 reviewed Mar 17, 2023

View reviewed changes

trustin approved these changes Mar 23, 2023

View reviewed changes

ikhoon added 2 commits March 28, 2023 01:45

Merge branch 'main' into spring-boot3

6ac4205

Address comments by @jrhee17

3c4864d

minwoox approved these changes Mar 28, 2023

View reviewed changes

jrhee17 approved these changes Mar 28, 2023

View reviewed changes

ikhoon added 2 commits March 28, 2023 16:44

Add missing updates

224489a

style

9e09c3b

jrhee17 approved these changes Mar 28, 2023

View reviewed changes

trustin approved these changes Mar 28, 2023

View reviewed changes

ikhoon mentioned this pull request Mar 28, 2023

Respect javaN to set Java targetCompatibility line/gradle-scripts#146

Merged

ikhoon merged commit 57295d3 into line:main Mar 28, 2023

ikhoon deleted the spring-boot3 branch March 28, 2023 09:18

ikhoon mentioned this pull request Mar 28, 2023

Remove Spring Boot 1 integration modules #4787

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Spring Boot 3 integration modules #4574

Add Spring Boot 3 integration modules #4574

ikhoon commented Dec 14, 2022 •

edited

Loading

ikhoon commented Feb 6, 2023

cj848 commented Feb 15, 2023

minwoox left a comment

minwoox Feb 16, 2023

ikhoon Mar 9, 2023 •

edited

Loading

minwoox Mar 28, 2023

minwoox commented Feb 16, 2023

jrhee17 left a comment

jrhee17 Mar 17, 2023

ikhoon Mar 27, 2023

jrhee17 Mar 17, 2023

ikhoon Mar 27, 2023

jrhee17 Mar 17, 2023

ikhoon Mar 27, 2023

trustin left a comment

minwoox left a comment

jrhee17 left a comment

ikhoon commented Mar 28, 2023 •

edited

Loading

jrhee17 left a comment

trustin left a comment

		}

		tasks.compileJava.dependsOn(generateSources)

Add Spring Boot 3 integration modules #4574

Add Spring Boot 3 integration modules #4574

Conversation

ikhoon commented Dec 14, 2022 • edited Loading

ikhoon commented Feb 6, 2023

cj848 commented Feb 15, 2023

minwoox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ikhoon Mar 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

minwoox commented Feb 16, 2023

jrhee17 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trustin left a comment

Choose a reason for hiding this comment

minwoox left a comment

Choose a reason for hiding this comment

jrhee17 left a comment

Choose a reason for hiding this comment

ikhoon commented Mar 28, 2023 • edited Loading

jrhee17 left a comment

Choose a reason for hiding this comment

trustin left a comment

Choose a reason for hiding this comment

ikhoon commented Dec 14, 2022 •

edited

Loading

ikhoon Mar 9, 2023 •

edited

Loading

ikhoon commented Mar 28, 2023 •

edited

Loading