This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch dependabot/maven/com.atlassian.oai-swagger-request-validator-core-3.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git
commit b82551186a614b16e2aa5ec000966baefc8141c5 Author: Aurélien Pupier <[email protected]> AuthorDate: Thu May 21 11:33:16 2026 +0200 Bump com.atlassian.oai:swagger-request-validator-core from 2.46.1 to com.atlassian.oai:openapi-request-validator-core 3.0.0 the artifact id has been renamed for 3.0.0 (even if it exists with there old one) an error message has slightly changed. I updated test accordingly, using assertj assertions to have better description when the message is failing Signed-off-by: Aurélien Pupier <[email protected]> --- components/camel-openapi-validator/pom.xml | 8 ++++++-- .../validator/client/OpenApiRestClientRequestValidatorTest.java | 6 ++++-- .../validator/client/OpenApiRestClientResponseValidatorTest.java | 4 +++- parent/pom.xml | 8 ++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/components/camel-openapi-validator/pom.xml b/components/camel-openapi-validator/pom.xml index 384c5a73290b..6ae0cb437ad2 100644 --- a/components/camel-openapi-validator/pom.xml +++ b/components/camel-openapi-validator/pom.xml @@ -49,8 +49,8 @@ <dependency> <groupId>com.atlassian.oai</groupId> - <artifactId>swagger-request-validator-core</artifactId> - <version>${swagger-request-validator-version}</version> + <artifactId>openapi-request-validator-core</artifactId> + <version>${openapi-request-validator-version}</version> </dependency> <!-- testing --> @@ -80,6 +80,10 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + </dependency> </dependencies> </project> diff --git a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java index e9ebd6b3ec82..39c39754d5a6 100644 --- a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java +++ b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java @@ -32,6 +32,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class OpenApiRestClientRequestValidatorTest extends ExchangeTestSupport { static OpenAPI openAPI; @@ -80,13 +82,13 @@ public class OpenApiRestClientRequestValidatorTest extends ExchangeTestSupport { = validator.validate(exchange, new RestClientRequestValidator.ValidationContext( "application/json", "application/json", true, null, null, null, null)); Assertions.assertNotNull(error); - Assertions.assertTrue(error.body().contains("A request body is required but none found")); + assertThat(error.body()).contains("A request body is required but none found"); exchange.getMessage().setBody("{ \"name\": \"tiger\" }"); error = validator.validate(exchange, new RestClientRequestValidator.ValidationContext( "application/json", "application/json", true, null, null, null, null)); Assertions.assertNotNull(error); - Assertions.assertTrue(error.body().contains("Object has missing required properties ([\\\"photoUrls\\\"])")); + assertThat(error.body()).contains("required property 'photoUrls' not found"); exchange.getMessage().setBody("{ \"name\": \"tiger\", \"photoUrls\": [\"image.jpg\"] }"); error = validator.validate(exchange, new RestClientRequestValidator.ValidationContext( diff --git a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java index 543b6322b7f2..292e086412f2 100644 --- a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java +++ b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java @@ -29,6 +29,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class OpenApiRestClientResponseValidatorTest extends ExchangeTestSupport { static OpenAPI openAPI; @@ -63,7 +65,7 @@ public class OpenApiRestClientResponseValidatorTest extends ExchangeTestSupport exchange.getMessage().setBody("{ \"name\": \"tiger\" }"); error = validator.validate(exchange, new RestClientResponseValidator.ValidationContext( "application/json", "application/json", null, null)); - Assertions.assertTrue(error.body().contains("Object has missing required properties ([\"photoUrls\"])")); + assertThat(error.body()).contains("required property 'photoUrls' not found"); exchange.getMessage().setBody("{ \"name\": \"tiger\", \"photoUrls\": [\"image.jpg\"] }"); error = validator.validate(exchange, new RestClientResponseValidator.ValidationContext( diff --git a/parent/pom.xml b/parent/pom.xml index 3274cbe2617e..b9c5198a0dfd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -412,6 +412,7 @@ <nimbus-jose-jwt>10.10</nimbus-jose-jwt> <olingo2-version>2.0.13</olingo2-version> <olingo4-version>5.0.0</olingo4-version> +<<<<<<< Upstream, based on origin/main <ognl-version>3.4.15</ognl-version> <onnxruntime-version>1.31.0</onnxruntime-version> <opa-version>2.1.1</opa-version> @@ -426,6 +427,13 @@ <ojdbc-version>23.8.0.25.04</ojdbc-version> <openai-java-version>4.78.0</openai-java-version> <openapi-generator-version>7.26.0</openapi-generator-version> +======= + <ognl-version>3.4.11</ognl-version> + <mcp-java-sdk-version>1.1.2</mcp-java-sdk-version> + <openai-java-version>4.36.0</openai-java-version> + <openapi-generator-version>7.22.0</openapi-generator-version> + <openapi-request-validator-version>3.0.0</openapi-request-validator-version> +>>>>>>> b1c9866 Bump com.atlassian.oai:swagger-request-validator-core from 2.46.1 to com.atlassian.oai:openapi-request-validator-core 3.0.0 <openjpa-version>4.1.1</openjpa-version> <opensearch-rest-client-version>3.9.0</opensearch-rest-client-version> <opensearch-java-client-version>3.10.0</opensearch-java-client-version>
