Merge branch 'main' into dependabot/gradle/org.openapi.generator-7.8.0

Author: pboos

CHANGELOG.md

@@ -4,6 +4,26 @@
 
 ## [Unreleased]
 
+## [2.2.1] - 2024-09-24
+
+### Fixed
+
+- Ignore unknownError related to ConcurrentModificationException ([#137](https://github.com/getyourguide/openapi-validation-java/pull/137))
+
+### Changed
+
+- Updated several dependencies
+
+## [2.2.0] - 2024-08-27
+
+### Added
+
+- Exclude graphql endpoints from validation by default ([#129](https://github.com/getyourguide/openapi-validation-java/pull/129))
+
+### Changed
+
+- Updated several dependencies
+
 ## [2.1.0] - 2024-06-03
 
 ### Added
@@ -165,7 +185,9 @@
 - Initial squashed GitHub public release.
 
 
-[unreleased]: https://github.com/getyourguide/openapi-validation-java/compare/v2.1.0...HEAD
+[unreleased]: https://github.com/getyourguide/openapi-validation-java/compare/v2.2.1...HEAD
+[2.2.1]: https://github.com/getyourguide/openapi-validation-java/releases/tag/v2.2.1
+[2.2.0]: https://github.com/getyourguide/openapi-validation-java/releases/tag/v2.2.0
 [2.1.0]: https://github.com/getyourguide/openapi-validation-java/releases/tag/v2.1.0
 [2.0.3]: https://github.com/getyourguide/openapi-validation-java/releases/tag/v2.0.3
 [2.0.2]: https://github.com/getyourguide/openapi-validation-java/releases/tag/v2.0.2

build.gradle

@@ -10,7 +10,7 @@ apply from: "${rootDir}/gradle/publish-root.gradle"
 allprojects {
     group = 'com.getyourguide.openapi.validation'
     description = 'OpenAPI Validation library'
-    version = '2.1.0'
+    version = '2.2.1'
 
     java {
         toolchain {

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
-spring-boot = "3.3.3"
+spring-boot = "3.3.4"
 spring-dependency-management = "1.1.6"
 openapi-generator = "7.8.0"
 openapi-tools = "0.2.6"
-swagger = "2.2.22"
-swagger-request-validator = "2.41.0"
+swagger = "2.2.25"
+swagger-request-validator = "2.43.0"
 jakarta-validation = "3.1.0"
 lombok = "1.18.34"
 commons-codec = "1.17.1"
 find-bugs = "3.0.2"
 gradle-nexus-publish-plugin = "2.0.0"
-datadog-statsd = "4.4.2"
+datadog-statsd = "4.4.3"
 # Verify
 checkstyle = "8.44"
 pmd = "6.55.0"
 jacoco = "0.8.7"
 # Testing
-mockito = "5.12.0"
-junit-jupiter = "5.11.0"
+mockito = "5.14.2"
+junit-jupiter = "5.11.3"
 
 [libraries]
 openapi-tools-jacksonDatabindNullable = { group = "org.openapitools", name = "jackson-databind-nullable", version.ref = "openapi-tools" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/exclusions/InternalViolationExclusions.java

@@ -58,7 +58,7 @@ private boolean falsePositive406(OpenApiViolation violation) {
     }
 
     private boolean isConcurrentModificationExceptionInLibrary(OpenApiViolation violation) {
-        return "validation.response.body.schema.unknownError".equals(violation.getRule())
+        return violation.getRule() != null && violation.getRule().endsWith(".body.schema.unknownError")
             && violation.getMessage().contains("java.util.ConcurrentModificationException");
     }
 }

openapi-validation-core/src/test/java/com/getyourguide/openapi/validation/core/exclusions/InternalViolationExclusionsTest.java

@@ -159,6 +159,26 @@ public void when406ResponseCodeWithStatusUnknownViolationThenViolationExcluded()
             .build());
     }
 
+    @Test
+    public void whenUnknownErrorWithConcurrentModificationExceptionThenViolationExcluded() {
+        when(customViolationExclusions.isExcluded(any())).thenReturn(false);
+        String message =
+            "An error occurred during schema validation - com.google.common.util.concurrent.UncheckedExecutionException: java.util.ConcurrentModificationException.";
+
+        checkViolationExcluded(OpenApiViolation.builder()
+            .direction(Direction.RESPONSE)
+            .rule("validation.request.body.schema.unknownError")
+            .responseStatus(200)
+            .message(message)
+            .build());
+        checkViolationExcluded(OpenApiViolation.builder()
+            .direction(Direction.RESPONSE)
+            .rule("validation.response.body.schema.unknownError")
+            .responseStatus(200)
+            .message(message)
+            .build());
+    }
+
     private void checkViolationNotExcluded(OpenApiViolation violation) {
         var isExcluded = violationExclusions.isExcluded(violation);