You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/03/31 09:47:46 UTC

[camel-quarkus] 14/43: Fix typo in docs & Added tests for NotNull validator checks

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit ffbbc9ad1b96545b8b656525f1f909cf234bcae9
Author: Martin Muzikar <46...@users.noreply.github.com>
AuthorDate: Wed Mar 23 13:09:52 2022 +0100

    Fix typo in docs & Added tests for NotNull validator checks
---
 docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc  | 2 +-
 extensions/bean-validator/runtime/src/main/doc/usage.adoc         | 2 +-
 .../component/bean/validator/it/BeanValidatorResource.java        | 8 ++++++++
 .../quarkus/component/bean/validator/it/BeanValidatorTest.java    | 5 ++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc b/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
index 89a9c98..b5efce7 100644
--- a/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
@@ -45,7 +45,7 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ
 
 Implementation of this extension leverages the https://quarkus.io/guides/validation[Quarkus Hibernate Validator extension].
 
-Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties ('constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).
+Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties (`constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).
 
 You can configure the `ValidatorFactory` by the creation of beans which will be injected into the default `ValidatorFactory` (created by Quarkus).
 See the https://quarkus.io/guides/validation#hibernate-validator-extension-and-cdi[Quarkus CDI documentation] for more information.
diff --git a/extensions/bean-validator/runtime/src/main/doc/usage.adoc b/extensions/bean-validator/runtime/src/main/doc/usage.adoc
index 1c85a6f..0c927a5 100644
--- a/extensions/bean-validator/runtime/src/main/doc/usage.adoc
+++ b/extensions/bean-validator/runtime/src/main/doc/usage.adoc
@@ -2,7 +2,7 @@
 
 Implementation of this extension leverages the https://quarkus.io/guides/validation[Quarkus Hibernate Validator extension].
 
-Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties ('constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).
+Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties (`constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).
 
 You can configure the `ValidatorFactory` by the creation of beans which will be injected into the default `ValidatorFactory` (created by Quarkus).
 See the https://quarkus.io/guides/validation#hibernate-validator-extension-and-cdi[Quarkus CDI documentation] for more information.
diff --git a/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java b/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
index e648a14..af9f29e 100644
--- a/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
+++ b/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
@@ -50,6 +50,14 @@ public class BeanValidatorResource {
         return get(new Car(manufactor, plate), endpoint);
     }
 
+    @Path("/get/{optional}/{manufactor}")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Response getNull(@PathParam("optional") String endpoint, @PathParam("manufactor") String manufactor)
+            throws Exception {
+        return get(new Car(manufactor, null), endpoint);
+    }
+
     private Response get(Car car, String endpoint) throws Exception {
         LOG.info("bean-validator: " + car.getManufacturer() + "/" + car.getLicensePlate());
         Exchange out = producerTemplate.request("direct:" + endpoint, e -> e.getMessage().setBody(car));
diff --git a/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java b/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java
index 9a31d80..8785041 100644
--- a/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java
+++ b/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java
@@ -33,7 +33,10 @@ class BeanValidatorTest {
         RestAssured.get("/bean-validator/get/start/honda/123").then().statusCode(200);
         //not-forced optional check
         RestAssured.get("/bean-validator/get/start/honda/DD-AB-12").then().statusCode(200);
-
+        //forced null-check
+        RestAssured.get("/bean-validator/get/start/honda").then().statusCode(400);
+        //Null-check not in optional group and null is valid for minSize
+        RestAssured.get("/bean-validator/get/optional/honda").then().statusCode(200);
     }
 
 }