Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions components/camel-openapi-validator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -80,6 +80,10 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
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;
Expand Down Expand Up @@ -57,13 +59,13 @@ public void testValidateBody() {
= 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
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;
Expand Down Expand Up @@ -63,7 +65,7 @@ public void testValidateBody() {
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(
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@
<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>
<openjpa-version>4.1.1</openjpa-version>
<opensearch-rest-client-version>3.6.0</opensearch-rest-client-version>
<opensearch-java-client-version>3.8.0</opensearch-java-client-version>
Expand Down Expand Up @@ -503,7 +504,6 @@
<swagger-openapi3-version>2.2.36</swagger-openapi3-version>
<swagger-java-parser-version>1.0.65</swagger-java-parser-version>
<swagger-openapi3-java-parser-version>2.1.42</swagger-openapi3-java-parser-version>
<swagger-request-validator-version>2.46.1</swagger-request-validator-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
<tahu-version>1.0.19</tahu-version>
<tamboui-version>0.3.0</tamboui-version>
Expand Down
Loading