Merge branch 'release-v1.2.x' into release-v2.2.x

Author: damianmalczewski

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

problem4j-spring-webflux/src/test/java/io/github/problem4j/spring/webflux/app/problem/BothAnnotatedException.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025-2026 The Problem4J Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.problem4j.spring.webflux.app.problem;
+
+import io.github.problem4j.core.ProblemMapping;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.FORBIDDEN)
+@ProblemMapping(status = 418, title = "Both Annotated Exception")
+public class BothAnnotatedException extends RuntimeException {}

problem4j-spring-webflux/src/test/java/io/github/problem4j/spring/webflux/app/rest/ResponseStatusAnnotatedController.java

@@ -21,6 +21,7 @@
 
 package io.github.problem4j.spring.webflux.app.rest;
 
+import io.github.problem4j.spring.webflux.app.problem.BothAnnotatedException;
 import io.github.problem4j.spring.webflux.app.problem.ForbiddenAnnotatedException;
 import io.github.problem4j.spring.webflux.app.problem.ReasonAnnotatedException;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,4 +41,9 @@ public String responseStatusAnnotated() {
   public String reasonAnnotated() {
     throw new ReasonAnnotatedException();
   }
+
+  @GetMapping("/both-annotated")
+  public String bothAnnotated() {
+    throw new BothAnnotatedException();
+  }
 }

problem4j-spring-webflux/src/test/java/io/github/problem4j/spring/webflux/integration/ResponseStatusAnnotatedExceptionWebFluxTest.java

@@ -70,4 +70,19 @@ void givenSpringNativeResponseStatusAnnotationWithReason_shouldReturnProblem() {
         .value(v -> assertThat(v).isNotNull())
         .isEqualTo(Problem.of(HttpStatus.FORBIDDEN.value(), "this is reason"));
   }
+
+  @Test
+  void givenBothResponseStatusAndProblemMappingAnnotations_shouldPreferProblemMapping() {
+    webTestClient
+        .get()
+        .uri("/response-status-annotated/both-annotated")
+        .exchange()
+        .expectStatus()
+        .isEqualTo(HttpStatus.valueOf(418))
+        .expectHeader()
+        .contentType(Problem.CONTENT_TYPE)
+        .expectBody(Problem.class)
+        .value(v -> assertThat(v).isNotNull())
+        .isEqualTo(Problem.builder().status(418).title("Both Annotated Exception").build());
+  }
 }

problem4j-spring-webmvc/src/test/java/io/github/problem4j/spring/webmvc/app/problem/BothAnnotatedException.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025-2026 The Problem4J Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.github.problem4j.spring.webmvc.app.problem;
+
+import io.github.problem4j.core.ProblemMapping;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.FORBIDDEN)
+@ProblemMapping(status = 418, title = "Both Annotated Exception")
+public class BothAnnotatedException extends RuntimeException {}

problem4j-spring-webmvc/src/test/java/io/github/problem4j/spring/webmvc/app/rest/ResponseStatusAnnotatedController.java

@@ -21,6 +21,7 @@
 
 package io.github.problem4j.spring.webmvc.app.rest;
 
+import io.github.problem4j.spring.webmvc.app.problem.BothAnnotatedException;
 import io.github.problem4j.spring.webmvc.app.problem.ForbiddenAnnotatedException;
 import io.github.problem4j.spring.webmvc.app.problem.ReasonAnnotatedException;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,4 +41,9 @@ public String responseStatusAnnotated() {
   public String reasonAnnotated() {
     throw new ReasonAnnotatedException();
   }
+
+  @GetMapping("/both-annotated")
+  public String bothAnnotated() {
+    throw new BothAnnotatedException();
+  }
 }

problem4j-spring-webmvc/src/test/java/io/github/problem4j/spring/webmvc/integration/ResponseStatusAnnotatedExceptionWebMvcTest.java

@@ -70,4 +70,18 @@ void givenSpringNativeResponseStatusAnnotationWithReason_shouldReturnProblem() {
 
     assertThat(problem).isEqualTo(Problem.of(HttpStatus.FORBIDDEN.value(), "this is reason"));
   }
+
+  @Test
+  void givenBothResponseStatusAndProblemMappingAnnotations_shouldPreferProblemMapping() {
+    ResponseEntity<String> response =
+        restTemplate.getForEntity("/response-status-annotated/both-annotated", String.class);
+
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.valueOf(418));
+    assertThat(response.getHeaders().getContentType()).hasToString(Problem.CONTENT_TYPE);
+
+    Problem problem = jsonMapper.readValue(response.getBody(), Problem.class);
+
+    assertThat(problem)
+        .isEqualTo(Problem.builder().status(418).title("Both Annotated Exception").build());
+  }
 }