Merge branch 'main' into fix/sample-rate-selection

Author: pboos

CODEOWNERS

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

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 java = "21"
 spring-boot = "4.0.7"
 spring-dependency-management = "1.1.7"
-openapi-generator = "7.21.0"
+openapi-generator = "7.22.0"
 openapi-tools = "0.2.9"
-swagger = "2.2.46"
+swagger = "2.2.49"
 swagger-request-validator = "2.46.1"
 jakarta-validation = "3.1.1"
 lombok = "1.18.44"

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.5.1-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

@@ -12,7 +12,8 @@ public class InternalViolationExclusions {
     private final ViolationExclusions customViolationExclusions;
 
     public boolean isExcluded(OpenApiViolation violation) {
-        return falsePositive404(violation)
+        return falsePositive204(violation)
+            || falsePositive404(violation)
             || falsePositive405(violation)
             || falsePositive406(violation)
             || falsePositiveRequestWith4xxResponse(violation)
@@ -31,6 +32,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

@@ -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));
     }
@@ -159,6 +160,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);

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

@@ -1,6 +1,6 @@
 service:
   name: openapi-validation-java
-  owner: uspr
+  owner: payx
   type: Library
   level: best effort
   main_language: Java