Merge branch 'main' into feature/configurable-ambiguous-oneof-violations

Author: pboos

CODEOWNERS

@@ -1 +1 @@
-* @getyourguide/uspr
+* @getyourguide/payx

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 java = "21"
-spring-boot = "4.0.7"
+spring-boot = "4.1.2"
 spring-dependency-management = "1.1.7"
-openapi-generator = "7.21.0"
-openapi-tools = "0.2.9"
-swagger = "2.2.46"
-swagger-request-validator = "2.46.1"
+openapi-generator = "7.26.0"
+openapi-tools = "0.2.13"
+swagger = "3.0.0"
+swagger-request-validator = "3.0.0"
 jakarta-validation = "3.1.1"
-lombok = "1.18.44"
-commons-codec = "1.21.0"
+lombok = "1.18.48"
+commons-codec = "1.23.0"
 find-bugs = "3.0.2"
 gradle-nexus-publish-plugin = "2.0.0"
 datadog-statsd = "4.4.5"
@@ -17,9 +17,9 @@ checkstyle = "8.44"
 pmd = "7.14.0"
 jacoco = "0.8.13"
 # Testing
-mockito = "5.23.0"
-junit-jupiter = "6.0.3"
-junit-platform = "6.0.3"
+mockito = "5.24.0"
+junit-jupiter = "6.1.3"
+junit-platform = "6.1.3"
 
 [libraries]
 openapi-tools-jacksonDatabindNullable = { group = "org.openapitools", name = "jackson-databind-nullable", version.ref = "openapi-tools" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,8 @@
 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.8.2-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -5,6 +5,7 @@ public static class Request {
         public static final String PATH_MISSING = "validation.request.path.missing";
         public static final String OPERATION_NOT_ALLOWED = "validation.request.operation.notAllowed";
         public static final String BODY_SCHEMA_ONE_OF = "validation.request.body.schema.oneOf";
+        public static final String ACCEPT_NOT_ALLOWED = "validation.request.accept.notAllowed";
     }
 
     public static class Response {

gradlew

@@ -23,7 +23,8 @@ public InternalViolationExclusions(
     }
 
     public boolean isExcluded(OpenApiViolation violation) {
-        return falsePositive404(violation)
+        return falsePositive204(violation)
+            || falsePositive404(violation)
             || falsePositive405(violation)
             || falsePositive406(violation)
             || falsePositiveRequestWith4xxResponse(violation)
@@ -42,6 +43,11 @@ private static boolean oneOfMatchesMoreThanOneSchema(OpenApiViolation violation)
             .matches(".*Instance failed to match exactly one schema \\(matched [1-9][0-9]* out of \\d+\\).*");
     }
 
+    private boolean falsePositive204(OpenApiViolation violation) {
+        return violation.getResponseStatus().orElse(0) == 204
+            && Rules.Request.ACCEPT_NOT_ALLOWED.equals(violation.getRule());
+    }
+
     private boolean falsePositive404(OpenApiViolation violation) {
         return
             (

gradlew.bat

@@ -2,17 +2,17 @@
 
 import com.getyourguide.openapi.validation.api.log.OpenApiViolationHandler;
 import com.getyourguide.openapi.validation.api.model.OpenApiViolation;
+import java.time.Instant;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
-import org.joda.time.DateTime;
 
 @AllArgsConstructor
 public class ThrottlingOpenApiViolationHandler implements OpenApiViolationHandler {
     private final OpenApiViolationHandler delegate;
     private final int waitSeconds;
-    private final Map<String, DateTime> loggedMessages = new ConcurrentHashMap<>();
+    private final Map<String, Instant> loggedMessages = new ConcurrentHashMap<>();
 
     @Override
     public void onOpenApiViolation(OpenApiViolation violation) {
@@ -25,13 +25,13 @@ public void onOpenApiViolation(OpenApiViolation violation) {
     }
 
     private void registerLoggedMessage(OpenApiViolation openApiViolation) {
-        loggedMessages.put(buildKey(openApiViolation), DateTime.now());
+        loggedMessages.put(buildKey(openApiViolation), Instant.now());
     }
 
     private boolean isThrottled(OpenApiViolation openApiViolation) {
         var key = buildKey(openApiViolation);
         var lastLoggedTime = loggedMessages.get(key);
-        return lastLoggedTime != null && lastLoggedTime.plusSeconds(waitSeconds).isAfterNow();
+        return lastLoggedTime != null && lastLoggedTime.plusSeconds(waitSeconds).isAfter(Instant.now());
     }
 
     @NonNull

openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/Rules.java

@@ -29,6 +29,7 @@ public void whenViolationThenViolationNotExcluded() {
         checkViolationNotExcluded(buildSimpleViolation(Direction.RESPONSE, 404));
         checkViolationNotExcluded(buildSimpleViolation(Direction.RESPONSE, 400));
         checkViolationNotExcluded(buildSimpleViolation(Direction.REQUEST, 200));
+        checkViolationNotExcluded(buildSimpleViolation(Direction.REQUEST, 204));
         checkViolationNotExcluded(buildSimpleViolation(Direction.REQUEST, null));
         checkViolationNotExcluded(buildSimpleViolation(Direction.RESPONSE, 200));
     }
@@ -180,6 +181,30 @@ public void when406ResponseCodeWithStatusUnknownViolationThenViolationExcluded()
             .build());
     }
 
+    @Test
+    public void when204ResponseCodeWithAcceptNotAllowedViolationThenViolationExcluded() {
+        when(customViolationExclusions.isExcluded(any())).thenReturn(false);
+
+        checkViolationExcluded(buildAcceptNotAllowedViolation(204));
+    }
+
+    @Test
+    public void whenNon204ResponseCodeWithAcceptNotAllowedViolationThenViolationNotExcluded() {
+        when(customViolationExclusions.isExcluded(any())).thenReturn(false);
+
+        checkViolationNotExcluded(buildAcceptNotAllowedViolation(200));
+    }
+
+    private static OpenApiViolation buildAcceptNotAllowedViolation(int responseStatus) {
+        return OpenApiViolation.builder()
+            .direction(Direction.REQUEST)
+            .rule("validation.request.accept.notAllowed")
+            .responseStatus(responseStatus)
+            .message("Request Accept header '[application/json]' does not match any defined response types. "
+                + "Must be one of: [application/problem+json].")
+            .build();
+    }
+
     @Test
     public void whenUnknownErrorWithConcurrentModificationExceptionThenViolationExcluded() {
         when(customViolationExclusions.isExcluded(any())).thenReturn(false);