Runtime compatibility with JPA 4.0 M4

jhoeller · jhoeller · commit 175c1f94377e · 2026-05-29T13:28:46.000+02:00
Closes gh-36784
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -509,6 +509,7 @@ else if (emf != null) {
 	 * Delegate an incoming invocation from the proxy, dispatching to EntityManagerFactoryInfo
 	 * or the native EntityManagerFactory accordingly.
 	 */
+	@SuppressWarnings("NullAway")  // for query.unwrap(null)
 	Object invokeProxyMethod(Method method, Object @Nullable [] args) throws Throwable {
 		if (method.getDeclaringClass().isAssignableFrom(EntityManagerFactoryInfo.class)) {
 			return method.invoke(this, args);
@@ -517,9 +518,8 @@ else if (method.getName().equals("createEntityManager") && args != null && args.
 				args[0] == SynchronizationType.SYNCHRONIZED) {
 			// JPA 2.1's createEntityManager(SynchronizationType, Map)
 			// Redirect to plain createEntityManager and add synchronization semantics through Spring proxy
-			EntityManager rawEntityManager = (args.length > 1 ?
-					getNativeEntityManagerFactory().createEntityManager((Map<?, ?>) args[1]) :
-					getNativeEntityManagerFactory().createEntityManager());
+			EntityManager rawEntityManager = EntityManagerFactoryUtils.createEntityManager(
+					getNativeEntityManagerFactory(), (args.length > 1 ? (Map<?, ?>) args[1] : null));
 			postProcessEntityManager(rawEntityManager);
 			return ExtendedEntityManagerCreator.createApplicationManagedEntityManager(rawEntityManager, this, true);
 		}
@@ -532,6 +532,7 @@ else if (method.getName().equals("createEntityManager") && args != null && args.
 					// Assumably a Spring-generated proxy from SharedEntityManagerCreator:
 					// since we're passing it back to the native EntityManagerFactory,
 					// let's unwrap it to the original Query object from the provider.
+					// Note that null is not an officially supported argument in JPA.
 					try {
 						args[i] = query.unwrap(null);
 					}
@@ -605,9 +606,8 @@ public EntityManagerFactory getNativeEntityManagerFactory() {
 
 	@Override
 	public EntityManager createNativeEntityManager(@Nullable Map<?, ?> properties) {
-		EntityManager rawEntityManager = (!CollectionUtils.isEmpty(properties) ?
-				getNativeEntityManagerFactory().createEntityManager(properties) :
-				getNativeEntityManagerFactory().createEntityManager());
+		EntityManager rawEntityManager = EntityManagerFactoryUtils.createEntityManager(
+				getNativeEntityManagerFactory(), properties);
 		postProcessEntityManager(rawEntityManager);
 		return rawEntityManager;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -162,7 +162,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	protected EntityManager createEntityManager() throws IllegalStateException {
 		EntityManagerFactory emf = obtainEntityManagerFactory();
 		Map<String, Object> properties = getJpaPropertyMap();
-		return (!CollectionUtils.isEmpty(properties) ? emf.createEntityManager(properties) : emf.createEntityManager());
+		return EntityManagerFactoryUtils.createEntityManager(emf, properties);
 	}
 
 	/**
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -79,10 +79,10 @@ public abstract class EntityManagerFactoryUtils {
 	public static final int ENTITY_MANAGER_SYNCHRONIZATION_ORDER =
 			DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100;
 
-	private static final @Nullable Method CREATE_ENTITY_AGENT_METHOD =
-			ClassUtils.getMethodIfAvailable(EntityManagerFactory.class, "createEntityAgent");
+	private static final boolean CREATE_ENTITY_MANAGER_WITHOUT_ARGUMENTS_AVAILABLE =
+			ClassUtils.hasMethod(EntityManagerFactory.class, "createEntityManager");
 
-	private static final @Nullable Method CREATE_ENTITY_AGENT_WITH_PROPERTIES_METHOD =
+	private static final @Nullable Method CREATE_ENTITY_AGENT_METHOD =
 			ClassUtils.getMethodIfAvailable(EntityManagerFactory.class, "createEntityAgent", Map.class);
 
 	private static final Log logger = LogFactory.getLog(EntityManagerFactoryUtils.class);
@@ -268,7 +268,7 @@ else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
 			}
 		}
 		if (em == null) {
-			em = (!CollectionUtils.isEmpty(properties) ? emf.createEntityManager(properties) : emf.createEntityManager());
+			em = createEntityManager(emf, properties);
 		}
 
 		try {
@@ -358,6 +358,23 @@ else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
 		return entityAgent;
 	}
 
+	/**
+	 * Create a new JPA EntityManager via reflectively detected JPA 3.2/4.0 API.
+	 * @param emf the EntityManagerFactory to create the EntityManager with
+	 * @param properties the properties to be passed into the {@code createEntityManager}
+	 * call (may be {@code null})
+	 * @since 7.0.8
+	 */
+	public static EntityManager createEntityManager(EntityManagerFactory emf, @Nullable Map<?, ?> properties) {
+		if (CollectionUtils.isEmpty(properties)) {
+			properties = null;
+		}
+		if (properties == null && CREATE_ENTITY_MANAGER_WITHOUT_ARGUMENTS_AVAILABLE) {
+			return emf.createEntityManager();  // on JPA 3.2
+		}
+		return emf.createEntityManager(properties);  // on JPA 4.0 even for empty properties
+	}
+
 	/**
 	 * Create a new JPA EntityAgent via reflectively detected JPA 4.0 API.
 	 * @param emf the EntityManagerFactory to create the EntityAgent with
@@ -366,12 +383,13 @@ else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
 	 * @since 7.0.4
 	 */
 	static Object createEntityAgent(EntityManagerFactory emf, @Nullable Map<?, ?> properties) {
-		if (CREATE_ENTITY_AGENT_METHOD == null || CREATE_ENTITY_AGENT_WITH_PROPERTIES_METHOD == null) {
+		if (CREATE_ENTITY_AGENT_METHOD == null) {
 			throw new IllegalStateException("JPA 4.0 createEntityAgent API not available");
 		}
-		Object entityAgent = (!CollectionUtils.isEmpty(properties) ?
-				ReflectionUtils.invokeMethod(CREATE_ENTITY_AGENT_WITH_PROPERTIES_METHOD, emf, properties) :
-				ReflectionUtils.invokeMethod(CREATE_ENTITY_AGENT_METHOD, emf));
+		if (CollectionUtils.isEmpty(properties)) {
+			properties = null;
+		}
+		Object entityAgent = ReflectionUtils.invokeMethod(CREATE_ENTITY_AGENT_METHOD, emf, properties);
 		if (entityAgent == null) {
 			throw new IllegalStateException("JPA 4.0 createEntityAgent API returned null");
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerRuntimeHints.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerRuntimeHints.java
@@ -31,6 +31,7 @@
  * {@link AbstractEntityManagerFactoryBean} and {@link SharedEntityManagerCreator} are registered.
  *
  * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  * @since 6.0
  */
 class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {
@@ -45,6 +46,12 @@ class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {
 	// As of Hibernate 7.1
 	private static final String SQM_QUERY_IMPL_CLASS_NAME = "org.hibernate.query.sqm.internal.SqmQueryImpl";
 
+	// As of Hibernate 8.0
+	private static final String SELECTION_QUERY_IMPL_CLASS_NAME = "org.hibernate.query.internal.SelectionQueryImpl";
+
+	// As of Hibernate 8.0
+	private static final String MUTATION_QUERY_IMPL_CLASS_NAME = "org.hibernate.query.internal.MutationQueryImpl";
+
 	private static final String NATIVE_QUERY_IMPL_CLASS_NAME = "org.hibernate.query.sql.internal.NativeQueryImpl";
 
 
@@ -76,6 +83,18 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 		}
 		catch (ClassNotFoundException ignored) {
 		}
+		try {
+			Class<?> clazz = ClassUtils.forName(SELECTION_QUERY_IMPL_CLASS_NAME, classLoader);
+			hints.proxies().registerJdkProxy(ClassUtils.getAllInterfacesForClass(clazz, classLoader));
+		}
+		catch (ClassNotFoundException ignored) {
+		}
+		try {
+			Class<?> clazz = ClassUtils.forName(MUTATION_QUERY_IMPL_CLASS_NAME, classLoader);
+			hints.proxies().registerJdkProxy(ClassUtils.getAllInterfacesForClass(clazz, classLoader));
+		}
+		catch (ClassNotFoundException ignored) {
+		}
 		try {
 			Class<?> clazz = ClassUtils.forName(NATIVE_QUERY_IMPL_CLASS_NAME, classLoader);
 			hints.proxies().registerJdkProxy(ClassUtils.getAllInterfacesForClass(clazz, classLoader));
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -42,7 +42,6 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
@@ -174,8 +173,7 @@ public static EntityManager createContainerManagedEntityManager(
 			return createProxy(rawEntityManager, emfInfo, true, synchronizedWithTransaction);
 		}
 		else {
-			EntityManager rawEntityManager = (!CollectionUtils.isEmpty(properties) ?
-					emf.createEntityManager(properties) : emf.createEntityManager());
+			EntityManager rawEntityManager = EntityManagerFactoryUtils.createEntityManager(emf, properties);
 			return createProxy(rawEntityManager, null, null, null, null, true, synchronizedWithTransaction);
 		}
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -475,8 +475,7 @@ protected EntityManager createEntityManagerForTransaction() {
 			em = emfInfo.createNativeEntityManager(properties);
 		}
 		else {
-			em = (!CollectionUtils.isEmpty(properties) ?
-					emf.createEntityManager(properties) : emf.createEntityManager());
+			em = EntityManagerFactoryUtils.createEntityManager(emf, properties);
 		}
 		if (this.entityManagerInitializer != null) {
 			this.entityManagerInitializer.accept(em);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
@@ -143,9 +143,7 @@ public void setPersistenceConfiguration(PersistenceConfiguration configuration)
 	 */
 	public PersistenceConfiguration getPersistenceConfiguration() {
 		if (this.configuration == null) {
-			String name = getPersistenceUnitName();
-			Assert.state(name != null, "No persistenceUnitName set");
-			this.configuration = new PersistenceConfiguration(name);
+			this.configuration = new PersistenceConfiguration(obtainPersistenceUnitName());
 		}
 		return this.configuration;
 	}
@@ -167,6 +165,12 @@ public void setPersistenceUnitName(@Nullable String persistenceUnitName) {
 		super.setPersistenceUnitName(persistenceUnitName);
 	}
 
+	private String obtainPersistenceUnitName() {
+		String name = getPersistenceUnitName();
+		Assert.state(name != null, "No persistenceUnitName set");
+		return name;
+	}
+
 	/**
 	 * Set whether to use Spring-based scanning for entity classes in the classpath
 	 * instead of using JPA's standard scanning of jar files with {@code persistence.xml}
@@ -265,7 +269,7 @@ protected EntityManagerFactory createNativeEntityManagerFactory() throws Persist
 			// Create EntityManagerFactory directly through PersistenceProvider.
 			EntityManagerFactory emf = (this.configuration != null ?
 					provider.createEntityManagerFactory(this.configuration) :
-					provider.createEntityManagerFactory(getPersistenceUnitName(), getJpaPropertyMap()));
+					provider.createEntityManagerFactory(obtainPersistenceUnitName(), getJpaPropertyMap()));
 			if (emf == null) {
 				throw new PersistenceException(
 						"PersistenceProvider [" + provider + "] could not find persistence unit for name '" +
@@ -277,7 +281,7 @@ protected EntityManagerFactory createNativeEntityManagerFactory() throws Persist
 			// Let JPA perform its standard PersistenceProvider autodetection.
 			return (this.configuration != null ?
 					Persistence.createEntityManagerFactory(this.configuration) :
-					Persistence.createEntityManagerFactory(getPersistenceUnitName(), getJpaPropertyMap()));
+					Persistence.createEntityManagerFactory(obtainPersistenceUnitName(), getJpaPropertyMap()));
 		}
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -39,7 +39,6 @@
 
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
@@ -376,9 +375,7 @@ public SharedEntityManagerInvocationHandler(
 			boolean newTarget = false;
 			if (target == null) {
 				logger.debug("Creating new EntityManager for shared EntityManager invocation");
-				target = (!CollectionUtils.isEmpty(this.properties) ?
-						this.targetFactory.createEntityManager(this.properties) :
-						this.targetFactory.createEntityManager());
+				target = EntityManagerFactoryUtils.createEntityManager(this.targetFactory, this.properties);
 				newTarget = true;
 			}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java
@@ -146,7 +146,11 @@ private void scanPackage(String pkg, ScanResult scanResult) {
 				try {
 					MetadataReader reader = factory.getMetadataReader(resource);
 					String className = reader.getClassMetadata().getClassName();
-					if (matchesEntityTypeFilter(reader, factory) && this.managedClassNameFilter.matches(className)) {
+					if (className.endsWith(ClassUtils.PACKAGE_INFO_SUFFIX)) {
+						scanResult.managedPackages.add(className.substring(0,
+								className.length() - ClassUtils.PACKAGE_INFO_SUFFIX.length()));
+					}
+					else if (matchesEntityTypeFilter(reader, factory) && this.managedClassNameFilter.matches(className)) {
 						scanResult.managedClassNames.add(className);
 						if (scanResult.persistenceUnitRootUrl == null) {
 							URL url = resource.getURL();
@@ -155,10 +159,6 @@ private void scanPackage(String pkg, ScanResult scanResult) {
 							}
 						}
 					}
-					if (className.endsWith(ClassUtils.PACKAGE_INFO_SUFFIX)) {
-						scanResult.managedPackages.add(className.substring(0,
-								className.length() - ClassUtils.PACKAGE_INFO_SUFFIX.length()));
-					}
 				}
 				catch (FileNotFoundException ex) {
 					// Ignore non-readable resource
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
@@ -240,7 +240,7 @@ else if (!StringUtils.hasLength(puName) && wac.containsBean(DEFAULT_ENTITY_MANAG
 	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
 	 */
 	protected EntityManager createEntityManager(EntityManagerFactory emf) {
-		return emf.createEntityManager();
+		return EntityManagerFactoryUtils.createEntityManager(emf, null);
 	}
 
 	private boolean applyEntityManagerBindingInterceptor(WebAsyncManager asyncManager, String key) {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerRuntimeHintsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerRuntimeHintsTests.java
@@ -19,11 +19,6 @@
 import jakarta.persistence.EntityManagerFactory;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.query.CommonQueryContract;
-import org.hibernate.query.SelectionQuery;
-import org.hibernate.query.hql.spi.SqmQueryImplementor;
-import org.hibernate.query.spi.DomainQueryExecutionContext;
-import org.hibernate.query.sqm.spi.InterpretationsKeySource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,8 +42,7 @@ class EntityManagerRuntimeHintsTests {
 	@BeforeEach
 	void setup() {
 		AotServices.factories().load(RuntimeHintsRegistrar.class)
-				.forEach(registrar -> registrar.registerHints(this.hints,
-						ClassUtils.getDefaultClassLoader()));
+				.forEach(registrar -> registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader()));
 	}
 
 	@Test
@@ -69,13 +63,4 @@ void entityManagerFactoryHasReflectionHints() {
 		assertThat(RuntimeHintsPredicates.reflection().onMethodInvocation(EntityManagerFactory.class, "getMetamodel")).accepts(this.hints);
 	}
 
-	@Test
-	void sqmQueryHints() {
-		assertThat(RuntimeHintsPredicates.proxies().forInterfaces(
-				SqmQueryImplementor.class,
-				InterpretationsKeySource.class,
-				DomainQueryExecutionContext.class,
-				SelectionQuery.class,
-				CommonQueryContract.class)).accepts(this.hints);
-	}
 }
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -76,19 +76,20 @@ class OpenEntityManagerInViewTests {
 
 
 	@BeforeEach
-	void setUp() {
+	void setup() {
 		given(factory.createEntityManager()).willReturn(manager);
 		this.request.setAsyncSupported(true);
 	}
 
 	@AfterEach
-	void tearDown() {
+	void cleanup() {
 		assertThat(TransactionSynchronizationManager.getResourceMap()).isEmpty();
 		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
 		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
 		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
 	}
 
+
 	@Test
 	void openEntityManagerInViewInterceptor() {
 		OpenEntityManagerInViewInterceptor interceptor = new OpenEntityManagerInViewInterceptor();
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
@@ -74,7 +74,7 @@ protected EntityManagerFactory findEntityManagerFactory(@Nullable String unitNam
 	}
 
 	@AfterEach
-	void clear() {
+	void cleanup() {
 		assertThat(TransactionSynchronizationManager.getResourceMap()).isEmpty();
 		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
 		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {`
`162`	`162`	`protected EntityManager createEntityManager() throws IllegalStateException {`
`163`	`163`	`EntityManagerFactory emf = obtainEntityManagerFactory();`
`164`	`164`	`Map<String, Object> properties = getJpaPropertyMap();`
`165`		`- return (!CollectionUtils.isEmpty(properties) ? emf.createEntityManager(properties) : emf.createEntityManager());`
	`165`	`+ return EntityManagerFactoryUtils.createEntityManager(emf, properties);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`import org.springframework.transaction.support.TransactionSynchronizationManager;`
`43`	`43`	`import org.springframework.util.Assert;`
`44`	`44`	`import org.springframework.util.ClassUtils;`
`45`		`-import org.springframework.util.CollectionUtils;`
`46`	`45`	`import org.springframework.util.ConcurrentReferenceHashMap;`
`47`	`46`
`48`	`47`	`/**`
`@@ -174,8 +173,7 @@ public static EntityManager createContainerManagedEntityManager(`
`174`	`173`	`return createProxy(rawEntityManager, emfInfo, true, synchronizedWithTransaction);`
`175`	`174`	`}`
`176`	`175`	`else {`
`177`		`- EntityManager rawEntityManager = (!CollectionUtils.isEmpty(properties) ?`
`178`		`- emf.createEntityManager(properties) : emf.createEntityManager());`
	`176`	`+ EntityManager rawEntityManager = EntityManagerFactoryUtils.createEntityManager(emf, properties);`
`179`	`177`	`return createProxy(rawEntityManager, null, null, null, null, true, synchronizedWithTransaction);`
`180`	`178`	`}`
`181`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,7 @@ protected EntityManager createEntityManagerForTransaction() {`
`475`	`475`	`em = emfInfo.createNativeEntityManager(properties);`
`476`	`476`	`}`
`477`	`477`	`else {`
`478`		`- em = (!CollectionUtils.isEmpty(properties) ?`
`479`		`- emf.createEntityManager(properties) : emf.createEntityManager());`
	`478`	`+ em = EntityManagerFactoryUtils.createEntityManager(emf, properties);`
`480`	`479`	`}`
`481`	`480`	`if (this.entityManagerInitializer != null) {`
`482`	`481`	`this.entityManagerInitializer.accept(em);`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,11 @@ private void scanPackage(String pkg, ScanResult scanResult) {`
`146`	`146`	`try {`
`147`	`147`	`MetadataReader reader = factory.getMetadataReader(resource);`
`148`	`148`	`String className = reader.getClassMetadata().getClassName();`
`149`		`- if (matchesEntityTypeFilter(reader, factory) && this.managedClassNameFilter.matches(className)) {`
	`149`	`+ if (className.endsWith(ClassUtils.PACKAGE_INFO_SUFFIX)) {`
	`150`	`+ scanResult.managedPackages.add(className.substring(0,`
	`151`	`+ className.length() - ClassUtils.PACKAGE_INFO_SUFFIX.length()));`
	`152`	`+ }`
	`153`	`+ else if (matchesEntityTypeFilter(reader, factory) && this.managedClassNameFilter.matches(className)) {`
`150`	`154`	`scanResult.managedClassNames.add(className);`
`151`	`155`	`if (scanResult.persistenceUnitRootUrl == null) {`
`152`	`156`	`URL url = resource.getURL();`
`@@ -155,10 +159,6 @@ private void scanPackage(String pkg, ScanResult scanResult) {`
`155`	`159`	`}`
`156`	`160`	`}`
`157`	`161`	`}`
`158`		`- if (className.endsWith(ClassUtils.PACKAGE_INFO_SUFFIX)) {`
`159`		`- scanResult.managedPackages.add(className.substring(0,`
`160`		`- className.length() - ClassUtils.PACKAGE_INFO_SUFFIX.length()));`
`161`		`- }`
`162`	`162`	`}`
`163`	`163`	`catch (FileNotFoundException ex) {`
`164`	`164`	`// Ignore non-readable resource`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ else if (!StringUtils.hasLength(puName) && wac.containsBean(DEFAULT_ENTITY_MANAG`
`240`	`240`	`* @see jakarta.persistence.EntityManagerFactory#createEntityManager()`
`241`	`241`	`*/`
`242`	`242`	`protected EntityManager createEntityManager(EntityManagerFactory emf) {`
`243`		`- return emf.createEntityManager();`
	`243`	`+ return EntityManagerFactoryUtils.createEntityManager(emf, null);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`private boolean applyEntityManagerBindingInterceptor(WebAsyncManager asyncManager, String key) {`