Merge branch 'release-v2.2.x'

Author: damianmalczewski

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2025-2026 The Problem4J Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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

@@ -16,6 +16,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;
@@ -35,4 +36,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

@@ -65,4 +65,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,25 @@
+/*
+ * Copyright 2025-2026 The Problem4J Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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

@@ -16,6 +16,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;
@@ -35,4 +36,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

@@ -65,4 +65,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());
+  }
 }