Fix validation for dynamic entities on the server

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Jun 27, 2022 · d230388 · d230388
1 parent 9afabf2
commit d230388
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 101 deletions.
diff --git a/...src/main/resources-server/persistence.xml → ...resources-server/META-INF/persistence.xml b/...src/main/resources-server/persistence.xml → ...resources-server/META-INF/persistence.xml
diff --git a/...stapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/employee-constraints.xml b/...stapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/employee-constraints.xml
diff --git a/...k.jpa.testapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/employee-orm.xml b/...k.jpa.testapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/employee-orm.xml
diff --git a/...ink.jpa.testapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/validation.xml b/...ink.jpa.testapps/jpa.test.beanvalidation.dynamic/src/main/resources-server/validation.xml
diff --git a/...stence/testing/tests/jpa/beanvalidation/dynamic/BeanValidationDynamicEntityJunitTest.java b/...stence/testing/tests/jpa/beanvalidation/dynamic/BeanValidationDynamicEntityJunitTest.java
@@ -18,14 +18,14 @@
 import jakarta.validation.ConstraintViolation;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.dynamic.DynamicClassLoader;
 import org.eclipse.persistence.dynamic.DynamicEntity;
 import org.eclipse.persistence.dynamic.DynamicType;
 import org.eclipse.persistence.internal.jpa.config.metadata.ReflectiveDynamicClassLoader;
 import org.eclipse.persistence.jpa.dynamic.JPADynamicHelper;
-import org.eclipse.persistence.testing.framework.TestSuite;
 import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
 import org.junit.Assert;
 
@@ -61,12 +61,17 @@ public static Test suite() {
      * 4. Assert - The validation exception is due to invalid value given by us.
      */
     public void testPersistDynamicEntityWithInvalidData() {
-        // Create an entity manager factory with a dynamic class loader.
-        DynamicClassLoader dcl = new ReflectiveDynamicClassLoader(Thread.currentThread().getContextClassLoader());
-        Map<String,Object> properties = new HashMap<>(getPersistenceProperties());
-        properties.put(PersistenceUnitProperties.CLASSLOADER, dcl);
-//        properties.put(PersistenceUnitProperties.BEAN_VALIDATION_NO_OPTIMISATION, "true");
-        EntityManager em = createEntityManager("beanvalidation-dynamic", properties);
+        EntityManager em;
+        if (isOnServer()) {
+            em = createEntityManager();
+        } else {
+            // Create an entity manager factory with a dynamic class loader.
+            DynamicClassLoader dcl = new ReflectiveDynamicClassLoader(Thread.currentThread().getContextClassLoader());
+            Map<String, Object> properties = new HashMap<>(getPersistenceProperties());
+            properties.put(PersistenceUnitProperties.CLASSLOADER, dcl);
+//            properties.put(PersistenceUnitProperties.BEAN_VALIDATION_NO_OPTIMISATION, "true");
+            em = createEntityManager("beanvalidation-dynamic", properties);
+        }
         EntityManagerFactory entityManagerFactory = em.getEntityManagerFactory();
 
         // Create types

diff --git a/...src/main/resources-server/persistence.xml → ...resources-server/META-INF/persistence.xml b/...src/main/resources-server/persistence.xml → ...resources-server/META-INF/persistence.xml
diff --git a/...a/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java b/...a/org/eclipse/persistence/internal/jpa/deployment/BeanValidationInitializationHelper.java
@@ -16,13 +16,9 @@
 
 package org.eclipse.persistence.internal.jpa.deployment;
 
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.util.Map;
-
+import jakarta.validation.Configuration;
 import jakarta.validation.Validation;
 import jakarta.validation.ValidatorFactory;
-
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.exceptions.PersistenceUnitLoadingException;
@@ -31,6 +27,11 @@
 import org.eclipse.persistence.internal.security.PrivilegedClassForName;
 import org.eclipse.persistence.internal.sessions.AbstractSession;
 
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.util.Map;
+
 /**
  * Responsible for intialializing Bean Validation. The only expected instance of this interface is the inner class.
  * @author Mitesh Meswani
@@ -46,7 +47,7 @@ public BeanValidationInitializationHelperImpl() {
         @Override
         public void bootstrapBeanValidation(Map puProperties, AbstractSession session, ClassLoader appClassLoader) {
 
-            ValidatorFactory validatorFactory = getValidatorFactory(puProperties);
+            ValidatorFactory validatorFactory = getValidatorFactory(puProperties, appClassLoader);
 
             //Check user/environment has specified the validator factory
             if (validatorFactory != null) {
@@ -75,13 +76,36 @@ public void bootstrapBeanValidation(Map puProperties, AbstractSession session, C
         /**
          * INTERNAL:
          * @param puProperties merged properties for this persitence unit
+         * @param appClassLoader application class loader (can be ie DynamicClassLoader, or its subclass,
+         *                      with the knowledge about Virtual/Dynamic Entities)
          * @return ValidatorFactory instance to be used for this persistence unit.
          */
-        private ValidatorFactory getValidatorFactory(Map puProperties) {
+        private ValidatorFactory getValidatorFactory(Map puProperties, final ClassLoader appClassLoader) {
             ValidatorFactory validatorFactory = (ValidatorFactory)puProperties.get(PersistenceUnitProperties.VALIDATOR_FACTORY);
 
             if (validatorFactory == null) {
-                validatorFactory = Validation.buildDefaultValidatorFactory();
+                Configuration<?> conf = Validation.byDefaultProvider().configure();
+                if (appClassLoader != null) {
+                    try {
+                        Configuration<?> finalConf = conf;
+                        // set external classloader for hibernate-validator to let it find dynamic (virtual) entities
+                        // without having compile-time dependency on it; in the other words, we can't do:
+                        //      Validation.byProvider( HibernateValidator.class )
+                        //        .configure()
+                        //        .externalClassLoader( classLoader )
+                        //        .buildValidatorFactory()
+                        conf = PrivilegedAccessHelper.callDoPrivilegedWithThrowable(() -> {
+                                    Method m = PrivilegedAccessHelper.getMethod(finalConf.getClass(),
+                                            "externalClassLoader", new Class[]{ClassLoader.class},
+                                            false);
+                                    return (Configuration<?>) m.invoke(finalConf, appClassLoader);
+                                }
+                        );
+                    } catch (Throwable t) {
+                        // not hibernate-validator, so ignore
+                    }
+                }
+                validatorFactory = conf.buildValidatorFactory();
             }
             return validatorFactory;
         }