Update spring-boot to 4.0.0-M1

Author: malczuuu

.github/utils/next_version.txt

@@ -1 +1 @@
-v1.1.0
+v2.0.0

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 jetbrains-annotations = "26.0.2-1"
 problem4j-core = "1.1.1"
-problem4j-jackson = "1.1.1"
-spring-boot = "3.5.7"
+problem4j-jackson3 = "1.0.2"
+spring-boot = "4.0.0-M3"
 
 [libraries]
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
 
 problem4j-core = { module = "io.github.malczuuu.problem4j:problem4j-core", version.ref = "problem4j-core" }
-problem4j-jackson = { module = "io.github.malczuuu.problem4j:problem4j-jackson", version.ref = "problem4j-jackson" }
+problem4j-jackson3 = { module = "io.github.malczuuu.problem4j:problem4j-jackson3", version.ref = "problem4j-jackson3" }
 
 spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
 spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" }
@@ -17,15 +17,19 @@ spring-boot-configuration-processor = { module = "org.springframework.boot:sprin
 spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure" }
 
 spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
 spring-boot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux" }
+spring-boot-starter-webmvc = { module = "org.springframework.boot:spring-boot-starter-webmvc" }
 spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation" }
 
+spring-boot-restclient = { module = "org.springframework.boot:spring-boot-restclient" }
+spring-boot-validation = { module = "org.springframework.boot:spring-boot-validation" }
+spring-boot-web-server = { module = "org.springframework.boot:spring-boot-web-server" }
+spring-boot-webflux = { module = "org.springframework.boot:spring-boot-webflux" }
+spring-boot-webmvc = { module = "org.springframework.boot:spring-boot-webmvc" }
+
 spring-web = { module = "org.springframework:spring-web" }
-spring-webflux = { module = "org.springframework:spring-webflux" }
-spring-webmvc = { module = "org.springframework:spring-webmvc" }
 
-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
+jackson-databind = { module = "tools.jackson.core:jackson-databind" }
 
 jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api" }
 jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api" }

problem4j-spring-bom/build.gradle.kts

@@ -11,7 +11,7 @@ val problem4jJacksonVersion: String by project
 dependencies {
     constraints {
         api(libs.problem4j.core)
-        api(libs.problem4j.jackson)
+        api(libs.problem4j.jackson3)
         api(project(":problem4j-spring-web"))
         api(project(":problem4j-spring-webflux"))
         api(project(":problem4j-spring-webmvc"))

problem4j-spring-web/build.gradle.kts

@@ -19,7 +19,7 @@ val springBootVersion: String by project
 dependencies {
     // Main
     api(libs.problem4j.core)
-    api(libs.problem4j.jackson)
+    api(libs.problem4j.jackson3)
 
     compileOnly(platform(libs.spring.boot.dependencies))
     compileOnly(libs.spring.boot.autoconfigure)
@@ -36,8 +36,8 @@ dependencies {
     // Test
     testImplementation(platform(libs.spring.boot.dependencies))
     testImplementation(libs.spring.boot.starter.test)
-    testImplementation(libs.spring.boot.starter.web)
-    testImplementation(libs.spring.boot.starter.validation)
+    testImplementation(libs.spring.boot.web.server)
+    testImplementation(libs.spring.boot.validation)
     testImplementation(libs.jakarta.servlet.api)
 
     testRuntimeOnly(libs.junit.platform.launcher)

problem4j-spring-web/src/main/java/io/github/malczuuu/problem4j/spring/web/ProblemAutoConfiguration.java

@@ -1,7 +1,6 @@
 package io.github.malczuuu.problem4j.spring.web;
 
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import io.github.malczuuu.problem4j.jackson.ProblemModule;
+import io.github.malczuuu.problem4j.jackson3.ProblemJacksonModule;
 import io.github.malczuuu.problem4j.spring.web.annotation.DefaultProblemMappingProcessor;
 import io.github.malczuuu.problem4j.spring.web.annotation.ProblemMappingProcessor;
 import io.github.malczuuu.problem4j.spring.web.format.DefaultProblemFormat;
@@ -19,6 +18,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import tools.jackson.databind.module.SimpleModule;
 
 @AutoConfiguration
 @EnableConfigurationProperties({ProblemProperties.class})
@@ -99,19 +99,19 @@ public ProblemResolverStore problemResolverStore(
     return problemResolverStore;
   }
 
-  @ConditionalOnClass({ProblemModule.class, SimpleModule.class})
+  @ConditionalOnClass({ProblemJacksonModule.class, SimpleModule.class})
   @Configuration(proxyBeanMethods = false)
   public static class ProblemModuleConfiguration {
 
     /**
-     * Provides a {@link ProblemModule} if none is defined.
+     * Provides a {@link ProblemJacksonModule} if none is defined.
      *
-     * @return a new {@link ProblemModule}
+     * @return a new {@link ProblemJacksonModule}
      */
-    @ConditionalOnMissingBean(ProblemModule.class)
+    @ConditionalOnMissingBean(ProblemJacksonModule.class)
     @Bean
-    public ProblemModule problemModule() {
-      return new ProblemModule();
+    public ProblemJacksonModule problemJacksonModule() {
+      return new ProblemJacksonModule();
     }
   }
 }

problem4j-spring-web/src/test/java/io/github/malczuuu/problem4j/spring/web/CachingProblemResolverStoreTest.java

@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -83,7 +84,8 @@ private static class DummyResolver extends AbstractProblemResolver {
   }
 
   @Test
-  void whenManyThreadsLookupSameException_thenComputeResolverRunsOnce() throws Exception {
+  void whenManyThreadsLookupSameException_thenComputeResolverRunsOnce()
+      throws InterruptedException, ExecutionException {
     AtomicInteger computeCounter = new AtomicInteger(0);
 
     DummyResolver resolver = new DummyResolver(IOException.class);

problem4j-spring-webflux/build.gradle.kts

@@ -19,8 +19,8 @@ dependencies {
 
     compileOnly(platform(libs.spring.boot.dependencies))
     compileOnly(libs.spring.boot.autoconfigure)
-    compileOnly(libs.spring.web)
-    compileOnly(libs.spring.webflux)
+    compileOnly(libs.spring.boot.web.server)
+    compileOnly(libs.spring.boot.webflux)
 
     compileOnly(libs.jakarta.validation.api)
     compileOnly(libs.slf4j.api)
@@ -31,7 +31,7 @@ dependencies {
     testImplementation(platform(libs.spring.boot.dependencies))
     testImplementation(libs.spring.boot.starter.test)
     testImplementation(libs.spring.boot.starter.webflux)
-    testImplementation(libs.spring.boot.starter.validation)
+    testImplementation(libs.spring.boot.validation)
 
     testRuntimeOnly(libs.junit.platform.launcher)
 }

problem4j-spring-webflux/src/main/java/io/github/malczuuu/problem4j/spring/webflux/ProblemEnhancedWebFluxHandler.java

@@ -57,14 +57,6 @@ public ProblemEnhancedWebFluxHandler(
     this.adviceWebFluxInspectors = adviceWebFluxInspectors;
   }
 
-  /**
-   * <b>Note:</b> Although {@link HttpHeaders#writableHttpHeaders(HttpHeaders)} is deprecated, it is
-   * used here for backward compatibility with older Spring Framework versions.
-   *
-   * <p>The deprecation alternative provided by Spring is not available in versions {@code 6.0.*}
-   * and {@code 6.1.*} (Spring Framework versions, not Spring Boot). Therefore, this method is
-   * retained to ensure compatibility across those versions.
-   */
   @Override
   protected Mono<ResponseEntity<Object>> handleExceptionInternal(
       Exception ex,
@@ -75,7 +67,7 @@ protected Mono<ResponseEntity<Object>> handleExceptionInternal(
     ProblemContext context =
         exchange.getAttributeOrDefault(PROBLEM_CONTEXT, ProblemContext.empty());
 
-    headers = headers != null ? HttpHeaders.writableHttpHeaders(headers) : new HttpHeaders();
+    headers = headers != null ? new HttpHeaders(headers) : new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_PROBLEM_JSON);
 
     Problem problem;

problem4j-spring-webflux/src/main/java/io/github/malczuuu/problem4j/spring/webflux/ProblemWebFluxAutoConfiguration.java

@@ -13,9 +13,9 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
+import org.springframework.boot.webflux.autoconfigure.error.ErrorWebFluxAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

problem4j-spring-webflux/src/main/java/io/github/malczuuu/problem4j/spring/webflux/error/ProblemErrorWebExceptionHandler.java

@@ -11,8 +11,8 @@
 import java.util.Optional;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
 import org.springframework.boot.autoconfigure.web.WebProperties;
-import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWebExceptionHandler;
-import org.springframework.boot.web.reactive.error.ErrorAttributes;
+import org.springframework.boot.webflux.autoconfigure.error.DefaultErrorWebExceptionHandler;
+import org.springframework.boot.webflux.error.ErrorAttributes;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -22,8 +22,8 @@
 import reactor.core.publisher.Mono;
 
 /**
- * A WebFlux {@link org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler} that
- * renders HTTP problems (RFC 7807) instead of the default JSON error response.
+ * A WebFlux {@link org.springframework.boot.webflux.error.ErrorWebExceptionHandler} that renders
+ * HTTP problems (RFC 7807) instead of the default JSON error response.
  *
  * <p>It replaces the response body with a {@link Problem} object while preserving the original HTTP
  * status and content type {@code application/problem+json}.