HV-1604 Fix instantiation of the JPATraversableResolver

engine/src/main/java/org/hibernate/validator/internal/engine/resolver/JPATraversableResolver.java

@@ -21,11 +21,13 @@
  * query the reachability of a property.
  * This resolver will be automatically enabled if JPA 2 is on the classpath and the default {@code TraversableResolver} is
  * used.
+ * <p>
+ * This class needs to be public as it's instantiated via a privileged action that is not in this package.
  *
  * @author Hardy Ferentschik
  * @author Emmanuel Bernard
  */
-class JPATraversableResolver implements TraversableResolver {
+public class JPATraversableResolver implements TraversableResolver {
 
 	private static final Log LOG = LoggerFactory.make( MethodHandles.lookup() );
 

engine/src/main/java/org/hibernate/validator/internal/engine/resolver/TraversableResolvers.java

@@ -106,10 +106,7 @@ public static TraversableResolver getDefault() {
 			return run( NewInstance.action( jpaAwareResolverClass, "" ) );
 		}
 		catch (ValidationException e) {
-			LOG.debugf(
-					"Unable to load or instantiate JPA aware resolver %s. All properties will per default be traversable.",
-					JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME
-			);
+			LOG.logUnableToLoadOrInstantiateJPAAwareResolver( JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME );
 			return getTraverseAllTraversableResolver();
 		}
 	}

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

@@ -845,4 +845,8 @@ ValidationException getUnableToAccessMethodException(Lookup lookup, @FormatWith(
 
 	@Message(id = 241, value = "Encountered unsupported element %1$s while parsing the XML configuration.")
 	ValidationException logUnknownElementInXmlConfiguration(String tag);
+
+	@LogMessage(level = WARN)
+	@Message(id = 242, value = "Unable to load or instantiate JPA aware resolver %1$s. All properties will per default be traversable.")
+	void logUnableToLoadOrInstantiateJPAAwareResolver(String traversableResolverClassName);
 }

engine/src/test/java/org/hibernate/validator/test/internal/engine/traversableresolver/JpaTraversableResolverTest.java

@@ -14,7 +14,7 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 
-import org.hibernate.validator.internal.engine.resolver.TraversableResolvers;
+import org.hibernate.validator.internal.engine.resolver.JPATraversableResolver;
 import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutils.ValidatorUtil;
 import org.testng.annotations.BeforeTest;
@@ -32,7 +32,7 @@ public class JpaTraversableResolverTest {
 	@BeforeTest
 	public void setUp() {
 		Configuration<?> configuration = ValidatorUtil.getConfiguration();
-		configuration.traversableResolver( TraversableResolvers.getDefault() );
+		configuration.traversableResolver( new JPATraversableResolver() );
 		validator = configuration.buildValidatorFactory().getValidator();
 	}
 
@@ -55,5 +55,3 @@ public void testWithoutBooks() {
 		assertTrue( results.isEmpty() );
 	}
 }
-
-

integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/JPATraversableResolverIT.java

@@ -0,0 +1,56 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.integration.wildfly.jpa;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.validation.TraversableResolver;
+
+import org.hibernate.validator.integration.AbstractArquillianIT;
+import org.hibernate.validator.internal.engine.resolver.JPATraversableResolver;
+import org.hibernate.validator.internal.engine.resolver.TraversableResolvers;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that the default {@link TraversableResolver} for a JPA environment is {@code JPATraversableResolver}.
+ *
+ * @author Guillaume Smet
+ */
+public class JPATraversableResolverIT extends AbstractArquillianIT {
+
+	private static final String WAR_FILE_NAME = JPATraversableResolverIT.class.getSimpleName() + ".war";
+
+	@Deployment
+	public static Archive<?> createTestArchive() {
+		return buildTestArchive( WAR_FILE_NAME )
+				.addAsResource( persistenceXml(), "META-INF/persistence.xml" )
+				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" );
+	}
+
+	private static Asset persistenceXml() {
+		String persistenceXml = Descriptors.create( PersistenceDescriptor.class )
+				.version( "2.0" )
+				.createPersistenceUnit()
+					.name( "default" )
+					.jtaDataSource( "java:jboss/datasources/ExampleDS" )
+				.up()
+				.exportAsString();
+		return new StringAsset( persistenceXml );
+	}
+
+	@Test
+	public void testDefaultTraversableResolverInJPAEnvironmentIsJPATraversableResolver() throws Exception {
+		assertThat( TraversableResolvers.getDefault() ).isInstanceOf( JPATraversableResolver.class );
+	}
+}