From 6f12259ca2b3200cf1cfcc757392ddaf4b43ea33 Mon Sep 17 00:00:00 2001 From: Juan Piero Santisteban Quiroz Date: Wed, 22 Jan 2025 20:33:46 -0500 Subject: [PATCH] [issues#964] Fix beanValidationCore.qute condition to include the jakarta.validation.Valid annotation --- .../templates/libraries/microprofile/beanValidationCore.qute | 3 +++ .../quarkiverse/openapi/generator/it/BeanValidationTest.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute index ede24017c..5c7b032e6 100644 --- a/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute +++ b/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute @@ -33,4 +33,7 @@ {#if p.maximum} @jakarta.validation.constraints.DecimalMax("{p.maximum}") {/if} + {/if} + {#if use-bean-validation} + @jakarta.validation.Valid {/if} \ No newline at end of file diff --git a/client/integration-tests/bean-validation/src/test/java/io/quarkiverse/openapi/generator/it/BeanValidationTest.java b/client/integration-tests/bean-validation/src/test/java/io/quarkiverse/openapi/generator/it/BeanValidationTest.java index 4e5d34a43..154ee8f3b 100644 --- a/client/integration-tests/bean-validation/src/test/java/io/quarkiverse/openapi/generator/it/BeanValidationTest.java +++ b/client/integration-tests/bean-validation/src/test/java/io/quarkiverse/openapi/generator/it/BeanValidationTest.java @@ -63,6 +63,7 @@ void testValidationAnnotationsAreInPlaceModel() throws Exception { assertThat(name.getAnnotationsByType(Size.class)).hasSize(2); assertThat(name.getAnnotationsByType(Size.class)[0].min()).isEqualTo(1); assertThat(name.getAnnotationsByType(Size.class)[1].max()).isEqualTo(10); + assertThat(name.isAnnotationPresent(Valid.class)).isTrue(); assertThat(size.isAnnotationPresent(DecimalMin.class)).isTrue(); assertThat(size.getAnnotation(DecimalMin.class).value()).isEqualTo("1.0"); @@ -94,6 +95,7 @@ void testValidationAnnotationsAreSkippedModel() throws Exception { assertThat(id.isAnnotationPresent(Max.class)).isFalse(); assertThat(name.isAnnotationPresent(Pattern.class)).isFalse(); assertThat(name.isAnnotationPresent(Size.List.class)).isFalse(); + assertThat(name.isAnnotationPresent(Valid.class)).isFalse(); assertThat(size.isAnnotationPresent(DecimalMin.class)).isFalse(); assertThat(size.isAnnotationPresent(DecimalMax.class)).isFalse(); }