Spring Boot 4.0.0 RC2

Author: antoinelochet

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
     id("pl.allegro.tech.build.axion-release") version "1.21.0"
     jacoco
     java
-    kotlin("jvm") version "2.0.21" apply false
+    kotlin("jvm") version "2.2.21" apply false
 }
 
 repositories {
@@ -28,10 +28,14 @@ scmVersion {
     }
 
     hooks {
-        pre("fileUpdate", mapOf(
+        pre(
+            "fileUpdate",
+            mapOf(
                 "file" to "README.md",
                 "pattern" to "{v,p -> /('$'v)/}",
-                "replacement" to """{v, p -> "'$'v"}]))"""))
+                "replacement" to """{v, p -> "'$'v"}]))""",
+            ),
+        )
         pre("commit")
     }
 }
@@ -40,7 +44,7 @@ val scmVer = scmVersion.version
 
 fun Project.isSampleProject() = this.name.contains("sample")
 
-val nonSampleProjects =  subprojects.filterNot { it.isSampleProject() }
+val nonSampleProjects = subprojects.filterNot { it.isSampleProject() }
 
 allprojects {
 
@@ -60,13 +64,16 @@ allprojects {
     }
 }
 
-
 subprojects {
 
-    val jacksonVersion by extra { "2.19.2" }
-    val springBootVersion by extra { "3.5.7" }
-    val springRestDocsVersion by extra { "3.0.5" }
-    val junitVersion by extra { "5.12.2" }
+    val jacksonVersion by extra { "3.0.2" }
+    val jackson2Version by extra { "2.20.1" }
+    val jacksonAnnotationsVersion by extra { "2.20" }
+    val springBootVersion by extra { "4.0.0-RC2" }
+    val springRestDocsVersion by extra { "4.0.0-RC1" }
+    val springRestDocsRestAssuredVersion by extra { "4.0.0-M3" }
+    val junitVersion by extra { "6.0.1" }
+    val jmustacheVersion by extra { "1.16" }
 
     tasks.withType<KotlinCompile> {
         compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
@@ -103,8 +110,24 @@ tasks {
     val jacocoRootReport by registering(JacocoReport::class) {
         description = "Generates an aggregate report from all subprojects"
         group = "Coverage reports"
-        sourceDirectories.setFrom(files(nonSampleProjects.flatMap { it.sourceSets["main"].allSource.srcDirs.filter { it.exists() && !it.path.endsWith("restdocs-api-spec-postman-generator/src/main/java") } } ))
-        classDirectories.setFrom(files(nonSampleProjects.flatMap { it.sourceSets["main"].output }.filter { !it.path.endsWith("restdocs-api-spec-postman-generator/build/classes/java/main") } ))
+        sourceDirectories.setFrom(
+            files(
+                nonSampleProjects.flatMap {
+                    it.sourceSets["main"].allSource.srcDirs.filter {
+                        it.exists() &&
+                            !it.path.endsWith("restdocs-api-spec-postman-generator/src/main/java")
+                    }
+                },
+            ),
+        )
+        classDirectories.setFrom(
+            files(
+                nonSampleProjects
+                    .flatMap {
+                        it.sourceSets["main"].output
+                    }.filter { !it.path.endsWith("restdocs-api-spec-postman-generator/build/classes/java/main") },
+            ),
+        )
         executionData(files(nonSampleProjects.map { it.layout.buildDirectory.file("jacoco/test.exec") }))
         reports {
             html.required.set(false)

restdocs-api-spec-gradle-plugin/build.gradle.kts

@@ -36,7 +36,6 @@ pluginBundle {
     }
 }
 
-
 val jacksonVersion: String by extra
 val junitVersion: String by extra
 
@@ -51,8 +50,9 @@ dependencies {
     implementation(project(":restdocs-api-spec-openapi-generator"))
     implementation(project(":restdocs-api-spec-openapi3-generator"))
     implementation(project(":restdocs-api-spec-postman-generator"))
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+    implementation("tools.jackson.core:jackson-databind:$jacksonVersion")
+    implementation("tools.jackson.module:jackson-module-kotlin:$jacksonVersion")
+    implementation("tools.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
 
     testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
@@ -76,7 +76,11 @@ val createTestKitFiles by tasks.registering {
 
     doLast {
         outputDir.get().asFile.mkdirs()
-        val destFile = project.layout.buildDirectory.file("jacoco/test.exec").get().asFile.path
+        val destFile =
+            project.layout.buildDirectory
+                .file("jacoco/test.exec")
+                .get()
+                .asFile.path
         val outFile = outputDir.get().file("testkit-gradle.properties").asFile
         outFile.writeText("org.gradle.jvmargs=-javaagent:${jacocoRuntime.asPath}=destfile=$destFile")
     }

restdocs-api-spec-gradle-plugin/src/main/kotlin/com/epages/restdocs/apispec/gradle/ApiSpecTask.kt

@@ -1,12 +1,13 @@
 package com.epages.restdocs.apispec.gradle
 
 import com.epages.restdocs.apispec.model.ResourceModel
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
+import tools.jackson.databind.DeserializationFeature
+import tools.jackson.module.kotlin.jacksonMapperBuilder
+import tools.jackson.module.kotlin.jacksonObjectMapper
+import tools.jackson.module.kotlin.readValue
 import java.io.File
 
 abstract class ApiSpecTask : DefaultTask() {
@@ -28,7 +29,7 @@ abstract class ApiSpecTask : DefaultTask() {
     private val snippetsDirectoryFile
         get() = project.file(snippetsDirectory)
 
-    private val objectMapper = jacksonObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+    private val objectMapper = jacksonMapperBuilder().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).build()
 
     open fun applyExtension(extension: ApiSpecExtension) {
         outputDirectory = extension.outputDirectory

restdocs-api-spec-gradle-plugin/src/main/kotlin/com/epages/restdocs/apispec/gradle/OpenApiExtension.kt

@@ -1,13 +1,13 @@
 package com.epages.restdocs.apispec.gradle
 
 import com.epages.restdocs.apispec.model.Oauth2Configuration
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
-import com.fasterxml.jackson.module.kotlin.readValue
 import groovy.lang.Closure
 import io.swagger.v3.oas.models.info.Contact
 import io.swagger.v3.oas.models.servers.Server
 import org.gradle.api.Project
+import tools.jackson.databind.ObjectMapper
+import tools.jackson.dataformat.yaml.YAMLFactory
+import tools.jackson.module.kotlin.readValue
 import java.io.File
 
 abstract class OpenApiBaseExtension(

restdocs-api-spec-gradle-plugin/src/main/kotlin/com/epages/restdocs/apispec/gradle/PostmanTask.kt

@@ -2,10 +2,11 @@ package com.epages.restdocs.apispec.gradle
 
 import com.epages.restdocs.apispec.model.ResourceModel
 import com.epages.restdocs.apispec.postman.PostmanCollectionGenerator
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
+import tools.jackson.databind.SerializationFeature
+import tools.jackson.module.kotlin.jacksonMapperBuilder
+import tools.jackson.module.kotlin.jacksonObjectMapper
 
 open class PostmanTask : ApiSpecTask() {
     @Input
@@ -23,7 +24,7 @@ open class PostmanTask : ApiSpecTask() {
     override fun outputFileExtension() = "json"
 
     override fun generateSpecification(resourceModels: List<ResourceModel>): String =
-        jacksonObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(
+        jacksonMapperBuilder().enable(SerializationFeature.INDENT_OUTPUT).build().writeValueAsString(
             PostmanCollectionGenerator.generate(
                 resources = resourceModels,
                 title = title,

restdocs-api-spec-jsonschema/build.gradle.kts

@@ -14,8 +14,8 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(project(":restdocs-api-spec-model"))
     implementation("com.github.erosb:everit-json-schema:1.11.0")
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+    implementation("tools.jackson.core:jackson-databind:$jacksonVersion")
+    implementation("tools.jackson.module:jackson-module-kotlin:$jacksonVersion")
 
     testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")

restdocs-api-spec-jsonschema/src/main/kotlin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGenerator.kt

@@ -10,8 +10,6 @@ import com.epages.restdocs.apispec.jsonschema.ConstraintResolver.minInteger
 import com.epages.restdocs.apispec.jsonschema.ConstraintResolver.minLengthString
 import com.epages.restdocs.apispec.model.Attributes
 import com.epages.restdocs.apispec.model.FieldDescriptor
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.everit.json.schema.ArraySchema
 import org.everit.json.schema.BooleanSchema
 import org.everit.json.schema.CombinedSchema
@@ -24,6 +22,9 @@ import org.everit.json.schema.ObjectSchema
 import org.everit.json.schema.Schema
 import org.everit.json.schema.StringSchema
 import org.everit.json.schema.internal.JSONPrinter
+import tools.jackson.databind.SerializationFeature
+import tools.jackson.module.kotlin.jacksonMapperBuilder
+import tools.jackson.module.kotlin.jacksonObjectMapper
 import java.io.StringWriter
 import java.util.Collections.emptyList
 import java.util.function.Predicate
@@ -89,7 +90,7 @@ class JsonSchemaFromFieldDescriptorsGenerator {
     }
 
     private fun toFormattedString(schema: Schema): String {
-        val objectMapper = jacksonObjectMapper().enable(SerializationFeature.INDENT_OUTPUT)
+        val objectMapper = jacksonMapperBuilder().enable(SerializationFeature.INDENT_OUTPUT).build()
         return StringWriter().use {
             schema.describeTo(JSONPrinter(it))
             objectMapper.writeValueAsString(objectMapper.readTree(it.toString()))

restdocs-api-spec-mockmvc/build.gradle.kts

@@ -17,13 +17,14 @@ dependencies {
     api(project(":restdocs-api-spec"))
     implementation("org.springframework.restdocs:spring-restdocs-mockmvc:$springRestDocsVersion")
 
-    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
-        exclude("junit")
-    }
+    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test:$springBootVersion")
+    testImplementation("org.springframework.boot:spring-boot-restdocs:$springBootVersion")
     testImplementation("org.springframework.boot:spring-boot-starter-validation:$springBootVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("org.junit-pioneer:junit-pioneer:2.3.0")
+    testImplementation(testFixtures(project(":restdocs-api-spec")))
     testImplementation("org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion")
 }
 

restdocs-api-spec-mockmvc/src/test/kotlin/com/epages/restdocs/apispec/MockMvcRestDocumentationWrapperIntegrationTest.kt

@@ -1,20 +1,25 @@
 package com.epages.restdocs.apispec
 
+import com.epages.apispec.restdocs.HalTestUtils
 import com.epages.restdocs.apispec.ResourceDocumentation.resource
 import org.assertj.core.api.Assertions.assertThatCode
 import org.assertj.core.api.BDDAssertions.then
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
 import org.springframework.hateoas.MediaTypes.HAL_JSON
 import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter
+import org.springframework.restdocs.RestDocumentationContextProvider
+import org.springframework.restdocs.RestDocumentationExtension
 import org.springframework.restdocs.headers.HeaderDocumentation.headerWithName
 import org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders
 import org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders
 import org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel
 import org.springframework.restdocs.hypermedia.HypermediaDocumentation.links
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document
+import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration
 import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post
 import org.springframework.restdocs.operation.preprocess.OperationRequestPreprocessor
 import org.springframework.restdocs.payload.PayloadDocumentation.beneathPath
@@ -24,17 +29,41 @@ import org.springframework.restdocs.payload.PayloadDocumentation.responseFields
 import org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath
 import org.springframework.restdocs.request.RequestDocumentation.parameterWithName
 import org.springframework.restdocs.request.RequestDocumentation.pathParameters
-import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers.print
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+import org.springframework.test.web.servlet.setup.StandaloneMockMvcBuilder
+import org.springframework.web.context.WebApplicationContext
+import tools.jackson.databind.json.JsonMapper
 import java.io.File
 
-@ExtendWith(SpringExtension::class)
+@ExtendWith(value = [RestDocumentationExtension::class])
 @WebMvcTest
-class MockMvcRestDocumentationWrapperIntegrationTest(
-    @Autowired private val mockMvc: MockMvc,
-) : ResourceSnippetIntegrationTest() {
+class MockMvcRestDocumentationWrapperIntegrationTest : ResourceSnippetIntegrationTest() {
+    private lateinit var mockMvc: MockMvc
+
+    private lateinit var mapper: JsonMapper
+
+    @BeforeEach
+    fun setUpModule() {
+    }
+
+    @BeforeEach
+    fun setUp(
+        webApplicationContext: WebApplicationContext,
+        restDocumentation: RestDocumentationContextProvider,
+    ) {
+        this.mapper = HalTestUtils.halMapper()
+        this.mockMvc =
+            MockMvcBuilders
+                .standaloneSetup(webApplicationContext, TestApplication.TestController())
+                .apply<StandaloneMockMvcBuilder>(documentationConfiguration(restDocumentation))
+                .setMessageConverters(
+                    JacksonJsonHttpMessageConverter(this.mapper),
+                ).build()
+    }
+
     @Test
     fun should_document_both_restdocs_and_resource() {
         givenEndpointInvoked()

restdocs-api-spec-mockmvc/src/test/kotlin/com/epages/restdocs/apispec/ResourceSnippetIntegrationTest.kt

@@ -7,12 +7,12 @@ import org.hibernate.validator.constraints.Length
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.hateoas.EntityModel
 import org.springframework.hateoas.IanaLinkRelations
 import org.springframework.hateoas.Link
+import org.springframework.hateoas.server.EntityLinks
 import org.springframework.hateoas.server.mvc.BasicLinkBuilder.linkToCurrentMapping
 import org.springframework.http.HttpHeaders.ACCEPT
 import org.springframework.http.HttpHeaders.CONTENT_TYPE
@@ -31,7 +31,6 @@ import java.util.UUID
 
 @ExtendWith(SpringExtension::class)
 @WebMvcTest
-@AutoConfigureRestDocs
 open class ResourceSnippetIntegrationTest {
     val operationName = "test-${System.currentTimeMillis()}"
 
@@ -70,7 +69,7 @@ open class ResourceSnippetIntegrationTest {
                 return ResponseEntity
                     .ok()
                     .header("X-Custom-Header", customHeader)
-                    .body<EntityModel<TestDataHolder>>(resource)
+                    .body(resource)
             }
         }
     }