Introduce validation modes instead of a boolean flag for BV integration in ORM

as well as switch to AUTO instead of the CALLBACK to enable the DDL integration by default.

Author: marko-bekhta

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java

@@ -664,9 +664,38 @@ interface HibernateOrmConfigPersistenceValidation {
 
         /**
          * Enables the Bean Validation integration.
+         *
+         * @deprecated Use {@link #modes()} instead.
          */
+        @Deprecated(since = "3.19", forRemoval = true)
         @WithDefault("true")
         boolean enabled();
+
+        /**
+         * Defines how the Bean Validation integration behaves.
+         */
+        @WithDefault("AUTO")
+        Set<ValidationMode> modes();
+
+        enum ValidationMode {
+            /**
+             * If a Bean Validation provider is present then behaves as if both {@link ValidationMode#CALLBACK} and
+             * {@link ValidationMode#DDL} modes are configured. Otherwise, same as {@link ValidationMode#NONE}.
+             */
+            AUTO,
+            /**
+             * Bean Validation will perform the lifecycle event validation.
+             */
+            CALLBACK,
+            /**
+             * Bean Validation constraints will be considered for the DDL operations.
+             */
+            DDL,
+            /**
+             * Bean Validation integration will be disabled.
+             */
+            NONE
+        }
     }
 
 }

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

@@ -1103,15 +1103,15 @@ private static void producePersistenceUnitDescriptorFromConfig(
             p.put(JAKARTA_SHARED_CACHE_MODE, SharedCacheMode.NONE);
         }
 
-        // Hibernate Validator integration: we force the callback mode to have bootstrap errors reported rather than validation ignored
-        // if there is any issue when bootstrapping Hibernate Validator.
-        if (capabilities.isPresent(Capability.HIBERNATE_VALIDATOR)) {
-            if (persistenceUnitConfig.validation().enabled()) {
-                descriptor.getProperties().setProperty(AvailableSettings.JAKARTA_VALIDATION_MODE,
-                        ValidationMode.CALLBACK.name());
-            } else {
-                descriptor.getProperties().setProperty(AvailableSettings.JAKARTA_VALIDATION_MODE, ValidationMode.NONE.name());
-            }
+        if (!persistenceUnitConfig.validation().enabled()) {
+            descriptor.getProperties().setProperty(AvailableSettings.JAKARTA_VALIDATION_MODE, ValidationMode.NONE.name());
+        } else {
+            descriptor.getProperties().setProperty(
+                    AvailableSettings.JAKARTA_VALIDATION_MODE,
+                    persistenceUnitConfig.validation().modes()
+                            .stream()
+                            .map(Enum::name)
+                            .collect(Collectors.joining(",")));
         }
 
         // Discriminator Column

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPATestValidationResource.java

@@ -7,9 +7,12 @@
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
 import io.quarkus.hibernate.orm.MyEntity;
 
 @Path("/validation")
@@ -35,4 +38,16 @@ public String save(String name) {
                     .collect(Collectors.joining());
         }
     }
+
+    @GET
+    public String ddl() {
+        return "nullable: " + em.getEntityManagerFactory()
+                .unwrap(SessionFactoryImplementor.class)
+                .getMappingMetamodel()
+                .getEntityDescriptor(MyEntity.class)
+                .getEntityMappingType()
+                .getAttributeMapping(0)
+                .getAttributeMetadata()
+                .isNullable();
+    }
 }

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationModeAutoTestCase.java

@@ -0,0 +1,33 @@
+package io.quarkus.hibernate.orm.validation;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class JPAValidationModeAutoTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(MyEntity.class, JPATestValidationResource.class)
+                    .addAsResource("application-validation-mode-auto.properties", "application.properties"));
+
+    @Test
+    public void testInValidEntity() {
+        String entityName = "Post method should not persist an entity having a Size constraint of 50 on the name column if validation was enabled.";
+        RestAssured.given().body(entityName).when().post("/validation").then()
+                .body(is("entity name too long"));
+    }
+
+    @Test
+    public void testDDL() {
+        RestAssured.when().get("/validation").then()
+                .body(is("nullable: false"));
+    }
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationModeMultipleTestCase.java

@@ -0,0 +1,33 @@
+package io.quarkus.hibernate.orm.validation;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class JPAValidationModeMultipleTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(MyEntity.class, JPATestValidationResource.class)
+                    .addAsResource("application-validation-mode-multiple.properties", "application.properties"));
+
+    @Test
+    public void testValidEntity() {
+        String entityName = "Post method should not persist an entity having a Size constraint of 50 on the name column if validation was enabled.";
+        RestAssured.given().body(entityName).when().post("/validation").then()
+                .body(is("entity name too long"));
+    }
+
+    @Test
+    public void testDDL() {
+        RestAssured.when().get("/validation").then()
+                .body(is("nullable: false"));
+    }
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationModeNoneTestCase.java

@@ -0,0 +1,33 @@
+package io.quarkus.hibernate.orm.validation;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class JPAValidationModeNoneTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(MyEntity.class, JPATestValidationResource.class)
+                    .addAsResource("application-validation-mode-none.properties", "application.properties"));
+
+    @Test
+    public void testValidEntity() {
+        String entityName = "Post method should not persist an entity having a Size constraint of 50 on the name column if validation was enabled.";
+        RestAssured.given().body(entityName).when().post("/validation").then()
+                .body(is("OK"));
+    }
+
+    @Test
+    public void testDDL() {
+        RestAssured.when().get("/validation").then()
+                .body(is("nullable: true"));
+    }
+
+}

extensions/hibernate-orm/deployment/src/test/resources/application-validation-mode-auto.properties

@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+#quarkus.hibernate-orm.log.sql=true
+#quarkus.hibernate-orm.validation.modes=AUTO
+quarkus.hibernate-orm.database.generation=drop-and-create

extensions/hibernate-orm/deployment/src/test/resources/application-validation-mode-multiple.properties

@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+#quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.validation.modes=callback,ddl
+quarkus.hibernate-orm.database.generation=drop-and-create

extensions/hibernate-orm/deployment/src/test/resources/application-validation-mode-none.properties

@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+#quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.validation.modes=none
+quarkus.hibernate-orm.database.generation=drop-and-create