HHH-14306 - Passed TcclLookupPrecedence parameter in JPA properties is ignored

hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java

@@ -41,7 +41,7 @@ public class ClassLoaderServiceImpl implements ClassLoaderService {
 
 	private static final String CLASS_PATH_SCHEME = "classpath://";
 
-	private final ConcurrentMap<Class, AggregatedServiceLoader<?>> serviceLoaders = new ConcurrentHashMap<>();
+	private final ConcurrentMap<Class<?>, AggregatedServiceLoader<?>> serviceLoaders = new ConcurrentHashMap<>();
 	private volatile AggregatedClassLoader aggregatedClassLoader;
 
 	/**
@@ -110,7 +110,10 @@ public class ClassLoaderServiceImpl implements ClassLoaderService {
 			providedClassLoaders.addAll( classLoaders );
 		}
 
-		return new ClassLoaderServiceImpl( providedClassLoaders,TcclLookupPrecedence.AFTER );
+		return new ClassLoaderServiceImpl(
+				providedClassLoaders,
+				TcclLookupPrecedence.from( configValues, TcclLookupPrecedence.AFTER )
+		);
 	}
 
 	@Override
@@ -119,10 +122,7 @@ public class ClassLoaderServiceImpl implements ClassLoaderService {
 		try {
 			return (Class<T>) Class.forName( className, true, getAggregatedClassLoader() );
 		}
-		catch (Exception e) {
+		catch (Exception | LinkageError e) {
-			throw new ClassLoadingException( "Unable to load class [" + className + "]", e );
-		}
-		catch (LinkageError e) {
 			throw new ClassLoadingException( "Unable to load class [" + className + "]", e );
 		}
 	}

hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/TcclLookupPrecedence.java

@@ -6,6 +6,10 @@
  */
 package org.hibernate.boot.registry.classloading.internal;
 
+import java.util.Map;
+
+import org.hibernate.cfg.AvailableSettings;
+
 /**
  * Defines when the lookup in the current thread context {@link ClassLoader} should be
  * done according to the other ones.
@@ -30,5 +34,40 @@ public enum TcclLookupPrecedence {
 	 * the former hasn't been found in the other {@code ClassLoader}s.
 	 * This is the default value.
 	 */
-	AFTER
+	AFTER;
+
+	/**
+	 * Resolves the precedence from a Map of settings.
+	 *
+	 * @return The precedence, or {@code null} if none was specified.
+	 * @throws IllegalArgumentException If there is a setting defined for
+	 * precedence, but it is not a legal value
+	 */
+	public static TcclLookupPrecedence from(Map<?,?> settings) {
+		return from( settings, null );
+	}
+
+	/**
+	 * Resolves the precedence from a Map of settings
+	 *
+	 * @return The precedence, or {@code defaultValue} if none was specified.
+	 * @throws IllegalArgumentException If there is a setting defined for
+	 * precedence, but it is not a legal value
+	 */
+	public static TcclLookupPrecedence from(Map<?,?> settings, TcclLookupPrecedence defaultValue) {
+		final String explicitSetting = (String) settings.get( AvailableSettings.TC_CLASSLOADER );
+		if ( explicitSetting == null ) {
+			return defaultValue;
+		}
+
+		if ( NEVER.name().equalsIgnoreCase( explicitSetting ) ) {
+			return NEVER;
+		}
+
+		if ( BEFORE.name().equalsIgnoreCase( explicitSetting ) ) {
+			return BEFORE;
+		}
+
+		throw new IllegalArgumentException( "Unknown TcclLookupPrecedence - " + explicitSetting );
+	}
 }

hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java

@@ -13,7 +13,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -120,7 +119,6 @@ import static org.hibernate.cfg.AvailableSettings.PASS;
 import static org.hibernate.cfg.AvailableSettings.PERSISTENCE_UNIT_NAME;
 import static org.hibernate.cfg.AvailableSettings.SCANNER_DISCOVERY;
 import static org.hibernate.cfg.AvailableSettings.SESSION_FACTORY_NAME;
-import static org.hibernate.cfg.AvailableSettings.TC_CLASSLOADER;
 import static org.hibernate.cfg.AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY;
 import static org.hibernate.cfg.AvailableSettings.URL;
 import static org.hibernate.cfg.AvailableSettings.USER;
@@ -468,15 +466,27 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
 			}
 		}
 
+		configureClassLoading( integrationSettings, providedClassLoader, providedClassLoaderService, bsrBuilder );
 
-		// ClassLoaders ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		return bsrBuilder.build();
-		// NOTE: See BootstrapServiceRegistryBuilder#build.  providedClassLoaderService and providedClassLoaders are
+	}
-		// mutually exclusive concepts, with priority given to the former
 
+	/**
+	 * @implNote {@code providedClassLoaderService} and {@code providedClassLoaders}
+	 * are mutually exclusive concepts, with priority given to the former.
+	 *
+	 * @see BootstrapServiceRegistryBuilder#build
+	 */
+	private void configureClassLoading(
+			Map<?, ?> integrationSettings,
+			ClassLoader providedClassLoader,
+			ClassLoaderService providedClassLoaderService,
+			BootstrapServiceRegistryBuilder bsrBuilder) {
 		if ( providedClassLoaderService != null ) {
 			bsrBuilder.applyClassLoaderService( providedClassLoaderService );
+			return;
 		}
-		else {
+
 		if ( persistenceUnit.getClassLoader() != null ) {
 			bsrBuilder.applyClassLoader( persistenceUnit.getClassLoader() );
 		}
@@ -505,18 +515,15 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
 		}
 
 		//configurationValues not assigned yet, using directly the properties of the PU
-			Properties puProperties = persistenceUnit.getProperties();
+		final Properties puProperties = persistenceUnit.getProperties();
 		if ( puProperties != null ) {
-				final String tcclLookupPrecedence = puProperties.getProperty( TC_CLASSLOADER );
+			final TcclLookupPrecedence tcclLookupPrecedence = TcclLookupPrecedence.from( puProperties );
 			if ( tcclLookupPrecedence != null ) {
-					bsrBuilder.applyTcclLookupPrecedence( TcclLookupPrecedence.valueOf( tcclLookupPrecedence.toUpperCase( Locale.ROOT ) ) );
+				bsrBuilder.applyTcclLookupPrecedence( tcclLookupPrecedence );
 			}
 		}
 	}
 
-		return bsrBuilder.build();
-	}
-
 	private void applyIntegrationProvider(Map<?,?> integrationSettings, BootstrapServiceRegistryBuilder bsrBuilder) {
 		Object integrationSetting = integrationSettings.get( INTEGRATOR_PROVIDER );
 		if ( integrationSetting == null ) {