Merge branch 'main' into fix/webflux-multi-buffer-response

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

@@ -45,7 +45,7 @@ public boolean shouldRequestBeValidated(RequestMetaData request) {
 
     private boolean isRandomlySelectedBySampleRate() {
         return sampleRate > 0
-            && (sampleRate >= 1 || ThreadLocalRandom.current().nextInt((int) (1 / sampleRate)) == 0);
+            && (sampleRate >= 1 || ThreadLocalRandom.current().nextDouble() < sampleRate);
     }
 
     @Override

gradlew.bat

@@ -1,6 +1,7 @@
 package com.getyourguide.openapi.validation.api.selector;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.getyourguide.openapi.validation.api.exclusions.ExcludedHeader;
 import com.getyourguide.openapi.validation.api.model.RequestMetaData;
@@ -9,9 +10,14 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+
 import org.junit.jupiter.api.Test;
 
 class DefaultTrafficSelectorTest {
+    private static final int SAMPLE_SIZE = 10000;
+    private static final double ACCEPTABLE_SAMPLE_RATE_DEVIATION = 0.02;
+
     private final TrafficSelector trafficSelector = new DefaultTrafficSelector(
         1.0,
         null,
@@ -69,4 +75,32 @@ private Map<String, String> toCaseInsensitiveMap(Map<String, String> map) {
         newMap.putAll(map);
         return newMap;
     }
+
+    @Test
+    public void testSampleRateIsApproximatelyCorrectForReciprocalValues() {
+        List.of(0.1, 0.25, 0.5).forEach(this::assertSampleRateIsApproximatelyCorrect);
+    }
+
+    @Test
+    public void testSampleRateIsApproximatelyCorrectForNonReciprocalValues() {
+        List.of(0.3, 0.8).forEach(this::assertSampleRateIsApproximatelyCorrect);
+    }
+
+    private void assertSampleRateIsApproximatelyCorrect(double sampleRate) {
+        var sampleRateTrafficSelector = new DefaultTrafficSelector(sampleRate, null, null);
+        var request = new RequestMetaData(
+            "GET",
+            URI.create("https://api.example.com/v1/path"),
+            Map.of("Content-Type", "application/json")
+        );
+        var validatedRequestCount = IntStream.range(0, SAMPLE_SIZE)
+            .filter(ignored -> sampleRateTrafficSelector.shouldRequestBeValidated(request))
+            .count();
+        var actualSampleRate = (double) validatedRequestCount / SAMPLE_SIZE;
+
+        assertTrue(
+            Math.abs(actualSampleRate - sampleRate) < ACCEPTABLE_SAMPLE_RATE_DEVIATION,
+            "Expected a sample rate close to " + sampleRate + ", but was " + actualSampleRate
+        );
+    }
 }

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

@@ -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
             (