Polishing.

Run AotMetamodel against live EntityManagerFactory, use Environment to check for AOT repository enabled flag.

See #3830

Author: mp911de

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

@@ -96,7 +96,6 @@ public EntityManager entityManager() {
 		return entityManager.get();
 	}
 
-	// TODO: Capture an existing factory bean (e.g. EntityManagerFactoryInfo) to extract PersistenceInfo
 	public EntityManagerFactory getEntityManagerFactory() {
 		return entityManagerFactory.get();
 	}
@@ -125,7 +124,8 @@ public void addTransformer(ClassTransformer classTransformer) {
 			public List<String> getManagedClassNames() {
 				return persistenceUnitInfo.getManagedClassNames();
 			}
-		}, Map.of("hibernate.dialect", "org.hibernate.dialect.H2Dialect")).build();
+		}, Map.of("hibernate.dialect", "org.hibernate.dialect.H2Dialect", "hibernate.boot.allow_jdbc_metadata_access",
+				"false")).build();
 	}
 
 }

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

@@ -189,8 +189,6 @@ protected void customizeConstructor(AotRepositoryConstructorBuilder constructorB
 			MergedAnnotation<EntityGraph> entityGraph = context.getAnnotation(EntityGraph.class);
 			MergedAnnotation<Modifying> modifying = context.getAnnotation(Modifying.class);
 
-			body.add(context.codeBlocks().logDebug("invoking [%s]".formatted(context.getMethod().getName())));
-
 			AotEntityGraph aotEntityGraph = entityGraphLookup.findEntityGraph(entityGraph, repositoryInformation,
 					returnedType, queryMethod);
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java

@@ -18,6 +18,7 @@
 import static org.springframework.data.jpa.repository.config.BeanDefinitionNames.*;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.PersistenceUnit;
@@ -38,6 +39,7 @@
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -325,15 +327,20 @@ static boolean isActive(@Nullable ClassLoader classLoader) {
 	 */
 	public static class JpaRepositoryRegistrationAotProcessor extends RepositoryRegistrationAotProcessor {
 
-		protected RepositoryContributor contribute(AotRepositoryContext repositoryContext, GenerationContext generationContext) {
+		protected @Nullable RepositoryContributor contribute(AotRepositoryContext repositoryContext,
+				GenerationContext generationContext) {
 
-			// don't register domain types nor annotations.
-
-			if (!AotContext.aotGeneratedRepositoriesEnabled()) {
+			boolean enabled = Boolean.parseBoolean(
+					repositoryContext.getEnvironment().getProperty(AotContext.GENERATED_REPOSITORIES_ENABLED, "false"));
+			if (!enabled) {
 				return null;
 			}
 
-			return new JpaRepositoryContributor(repositoryContext);
+			ConfigurableListableBeanFactory beanFactory = repositoryContext.getBeanFactory();
+			EntityManagerFactory emf = beanFactory.getBeanProvider(EntityManagerFactory.class).getIfAvailable();
+
+			return emf != null ? new JpaRepositoryContributor(repositoryContext, emf)
+					: new JpaRepositoryContributor(repositoryContext);
 		}
 
 		@Nullable

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/TestJpaAotRepositoryContext.java

@@ -25,6 +25,8 @@
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.test.tools.ClassFile;
 import org.springframework.data.jpa.domain.sample.Role;
@@ -35,6 +37,8 @@
 import org.springframework.lang.Nullable;
 
 /**
+ * Test {@link AotRepositoryContext} implementation for JPA repositories.
+ *
  * @author Christoph Strobl
  */
 public class TestJpaAotRepositoryContext<T> implements AotRepositoryContext {
@@ -56,6 +60,11 @@ public ConfigurableListableBeanFactory getBeanFactory() {
 		return null;
 	}
 
+	@Override
+	public Environment getEnvironment() {
+		return new StandardEnvironment();
+	}
+
 	@Override
 	public TypeIntrospector introspectType(String typeName) {
 		return null;

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java

@@ -31,6 +31,8 @@
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.repository.config.AotRepositoryContext;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.javapoet.ClassName;
@@ -116,6 +118,11 @@ public ConfigurableListableBeanFactory getBeanFactory() {
 			return null;
 		}
 
+		@Override
+		public Environment getEnvironment() {
+			return new StandardEnvironment();
+		}
+
 		@Override
 		public TypeIntrospector introspectType(String typeName) {
 			return null;