Switch to SpringPersistenceUnitInfo for AOT processing.

Fix nullable constraints along the way. Closes: #4039

Author: christophstrobl

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/AotMetamodel.java

@@ -21,12 +21,10 @@
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.ManagedType;
 import jakarta.persistence.metamodel.Metamodel;
-import jakarta.persistence.spi.ClassTransformer;
 import jakarta.persistence.spi.PersistenceUnitInfo;
 
 import java.net.URL;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -38,12 +36,10 @@
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.internal.PersistenceUnitInfoDescriptor;
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.data.repository.config.AotRepositoryContext;
 import org.springframework.data.util.Lazy;
-import org.springframework.instrument.classloading.SimpleThrowawayClassLoader;
-import org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo;
 import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypes;
+import org.springframework.orm.jpa.persistenceunit.SpringPersistenceUnitInfo;
 
 /**
  * AOT metamodel implementation that uses Hibernate to build the metamodel.
@@ -76,38 +72,17 @@ public AotMetamodel(PersistenceManagedTypes managedTypes) {
 
 public AotMetamodel(Collection<String> managedTypes, @Nullable URL persistenceUnitRootUrl) {
 
-MutablePersistenceUnitInfo persistenceUnitInfo = new MutablePersistenceUnitInfo() {
-@Override
-public ClassLoader getNewTempClassLoader() {
-return new SimpleThrowawayClassLoader(this.getClass().getClassLoader());
-}
-
-@Override
-public void addTransformer(ClassTransformer classTransformer) {
-// just ignore it
-}
-};
-persistenceUnitInfo.setPersistenceUnitName("AotMetaModel");
+SpringPersistenceUnitInfo persistenceUnitInfo = new SpringPersistenceUnitInfo(
+managedTypes.getClass().getClassLoader());
+persistenceUnitInfo.setPersistenceUnitName("AotMetamodel");
+persistenceUnitInfo.setPersistenceUnitRootUrl(persistenceUnitRootUrl);
 
 this.entityManagerFactory = init(() -> {
 
 managedTypes.forEach(persistenceUnitInfo::addManagedClassName);
 
 persistenceUnitInfo.setPersistenceProviderClassName(HibernatePersistenceProvider.class.getName());
-
-return new PersistenceUnitInfoDescriptor(persistenceUnitInfo) {
-
-@Override
-public List<String> getManagedClassNames() {
-return persistenceUnitInfo.getManagedClassNames();
-}
-
-@Override
-public URL getPersistenceUnitRootUrl() {
-return persistenceUnitRootUrl != null ? persistenceUnitRootUrl : super.getPersistenceUnitRootUrl();
-}
-
-};
+return new PersistenceUnitInfoDescriptor(persistenceUnitInfo.asStandardPersistenceUnitInfo());
 });
 }
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRepositoryContributor.java

@@ -150,7 +150,7 @@ protected void customizeConstructor(AotRepositoryConstructorBuilder constructorB
 });
 }
 
-private String getEntityManagerFactoryRef() {
+private @Nullable String getEntityManagerFactoryRef() {
 return context.getConfigurationSource().getAttribute("entityManagerFactoryRef")
 .filter(it -> !"entityManagerFactory".equals(it)).orElse(null);
 }

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java

@@ -834,7 +834,7 @@ static class FromExpressionFactory extends ExpressionFactorySupport {
  * @param <T> the type of the expression
  * @return the expression
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "NullAway" })
 <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property, boolean isForSelection,
 boolean hasRequiredOuterJoin) {
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java

@@ -18,18 +18,18 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import jakarta.persistence.spi.PersistenceUnitInfo;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.orm.jpa.persistenceunit.DefaultPersistenceUnitManager;
 import org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo;
+import org.springframework.util.StringUtils;
 
 /**
  * Extends {@link DefaultPersistenceUnitManager} to merge configurations of one persistence unit residing in multiple
  * {@code persistence.xml} files into one. This is necessary to allow the declaration of entities in separate modules.
  *
  * @author Oliver Gierke
+ * @author Christoph Strobl
  * @link https://github.com/spring-projects/spring-framework/issues/7287
  */
 public class MergingPersistenceUnitManager extends DefaultPersistenceUnitManager {
@@ -42,10 +42,12 @@ protected void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui) {
 // Invoke normal post processing
 super.postProcessPersistenceUnitInfo(pui);
 
-PersistenceUnitInfo oldPui = getPersistenceUnitInfo(((PersistenceUnitInfo) pui).getPersistenceUnitName());
+if (StringUtils.hasText(pui.getPersistenceUnitName())) {
+MutablePersistenceUnitInfo oldPui = getPersistenceUnitInfo(pui.getPersistenceUnitName());
 
-if (oldPui != null) {
-postProcessPersistenceUnitInfo(pui, oldPui);
+if (oldPui != null) {
+postProcessPersistenceUnitInfo(pui, oldPui);
+}
 }
 }
 
@@ -54,7 +56,7 @@ protected boolean isPersistenceUnitOverrideAllowed() {
 return true;
 }
 
-void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui, PersistenceUnitInfo oldPui) {
+void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui, MutablePersistenceUnitInfo oldPui) {
 
 String persistenceUnitName = pui.getPersistenceUnitName();
 
@@ -82,7 +84,8 @@ void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui, PersistenceU
 if (!pui.getMappingFileNames().contains(mappingFileName)) {
 
 if (LOG.isDebugEnabled()) {
-LOG.debug(String.format("Adding mapping file %s to persistence unit %s", mappingFileName, persistenceUnitName));
+LOG.debug(
+String.format("Adding mapping file %s to persistence unit %s", mappingFileName, persistenceUnitName));
 }
 pui.addMappingFileName(mappingFileName);
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java

@@ -46,7 +46,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class MergingPersistenceUnitManagerUnitTests {
 
-@Mock PersistenceUnitInfo oldInfo;
+@Mock MutablePersistenceUnitInfo oldInfo;
 
 @Mock MutablePersistenceUnitInfo newInfo;
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/util/TestMetaModel.java

@@ -21,18 +21,15 @@
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.ManagedType;
 import jakarta.persistence.metamodel.Metamodel;
-import jakarta.persistence.spi.ClassTransformer;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.internal.PersistenceUnitInfoDescriptor;
 import org.springframework.data.util.Lazy;
-import org.springframework.instrument.classloading.SimpleThrowawayClassLoader;
-import org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo;
+import org.springframework.orm.jpa.persistenceunit.SpringPersistenceUnitInfo;
 
 /**
  * @author Christoph Strobl
@@ -97,28 +94,14 @@ public EntityManager entityManager() {
 
 EntityManagerFactory init() {
 
-MutablePersistenceUnitInfo persistenceUnitInfo = new MutablePersistenceUnitInfo() {
-@Override
-public ClassLoader getNewTempClassLoader() {
-return new SimpleThrowawayClassLoader(this.getClass().getClassLoader());
-}
-
-@Override
-public void addTransformer(ClassTransformer classTransformer) {
-// just ingnore it
-}
-};
+SpringPersistenceUnitInfo persistenceUnitInfo = new SpringPersistenceUnitInfo(this.getClass().getClassLoader());
 
 persistenceUnitInfo.setPersistenceUnitName(persistenceUnit);
 this.managedTypes.stream().map(Class::getName).forEach(persistenceUnitInfo::addManagedClassName);
-
 persistenceUnitInfo.setPersistenceProviderClassName(HibernatePersistenceProvider.class.getName());
 
-return new EntityManagerFactoryBuilderImpl(new PersistenceUnitInfoDescriptor(persistenceUnitInfo) {
-@Override
-public List<String> getManagedClassNames() {
-return persistenceUnitInfo.getManagedClassNames();
-}
-}, Map.of("hibernate.dialect", "org.hibernate.dialect.H2Dialect")).build();
+return new EntityManagerFactoryBuilderImpl(
+new PersistenceUnitInfoDescriptor(persistenceUnitInfo.asStandardPersistenceUnitInfo()) {},
+Map.of("hibernate.dialect", "org.hibernate.dialect.H2Dialect")).build();
 }
 }