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/JpaCodeBlocks.java

@@ -45,6 +45,7 @@
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
 import org.springframework.javapoet.TypeName;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -140,6 +141,8 @@ public QueryBlockBuilder queryRewriter(@Nullable Class<?> queryRewriter) {
 		 */
 		public CodeBlock build() {
 
+			Assert.notNull(queries, "Queries must not be null");
+
 			boolean isProjecting = context.getReturnedType().isProjecting();
 			Class<?> actualReturnType = isProjecting ? context.getActualReturnType().toClass()
 					: context.getRepositoryInformation().getDomainType();
@@ -153,7 +156,6 @@ public CodeBlock build() {
 			builder.add("\n");
 
 			String queryStringVariableName = null;
-
 			String queryRewriterName = null;
 
 			if (queries.result() instanceof StringAotQuery && queryRewriter != QueryRewriter.IdentityQueryRewriter.class) {
@@ -162,7 +164,7 @@ public CodeBlock build() {
 				builder.addStatement("$T $L = new $T()", queryRewriter, queryRewriterName, queryRewriter);
 			}
 
-			if (queries != null && queries.result() instanceof StringAotQuery sq) {
+			if (queries.result() instanceof StringAotQuery sq) {
 
 				queryStringVariableName = "%sString".formatted(queryVariableName);
 				builder.add(buildQueryString(sq, queryStringVariableName));
@@ -183,7 +185,8 @@ public CodeBlock build() {
 			}
 
 			if ((StringUtils.hasText(sortParameterName) || StringUtils.hasText(dynamicReturnType))
-					&& queries.result() instanceof StringAotQuery) {
+					&& queries != null && queries.result() instanceof StringAotQuery
+					&& StringUtils.hasText(queryStringVariableName)) {
 				builder.add(applyRewrite(sortParameterName, dynamicReturnType, queryStringVariableName, actualReturnType));
 			}
 
@@ -605,7 +608,7 @@ public CodeBlock build() {
 				}
 			} else if (aotQuery != null && aotQuery.isExists()) {
 				builder.addStatement("return !$L.getResultList().isEmpty()", queryVariableName);
-			} else {
+			} else if (aotQuery != null) {
 
 				if (context.getReturnedType().isProjecting()) {
 

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,22 +327,29 @@ 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
 		@Override
+		@SuppressWarnings("NullAway")
 		protected RepositoryConfiguration<?> getRepositoryMetadata(RegisteredBean bean) {
 			RepositoryConfiguration<?> configuration = super.getRepositoryMetadata(bean);
-			if (!configuration.getRepositoryBaseClassName().isEmpty()) {
+
+			if (configuration != null && configuration.getRepositoryBaseClassName().isPresent()) {
 				return configuration;
 			}
 			return new Meh<>(configuration);

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

@@ -34,6 +34,7 @@
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
 import org.springframework.data.util.Lazy;
+import org.springframework.util.StringUtils;
 
 /**
  * Implementation of {@link RepositoryQuery} based on {@link jakarta.persistence.NamedQuery}s.
@@ -97,12 +98,26 @@ private NamedQuery(JpaQueryMethod method, EntityManager em, JpaQueryConfiguratio
 
 		String queryString = extractor.extractQueryString(namedQuery);
 
-		// TODO: What is queryString is null?
 		DeclaredQuery declaredQuery;
-		if (method.isNativeQuery() || (namedQuery != null && namedQuery.toString().contains("NativeQuery"))) {
-			declaredQuery = DeclaredQuery.nativeQuery(queryString);
-		} else {
-			declaredQuery = DeclaredQuery.jpqlQuery(queryString);
+		if (StringUtils.hasText(queryString)) {
+			if (method.isNativeQuery() || namedQuery.toString().contains("NativeQuery")) {
+				declaredQuery = DeclaredQuery.nativeQuery(queryString);
+			} else {
+				declaredQuery = DeclaredQuery.jpqlQuery(queryString);
+			}
+		}
+		else {
+			declaredQuery = new DeclaredQuery() {
+				@Override
+				public boolean isNative() {
+					return false;
+				}
+
+				@Override
+				public String getQueryString() {
+					return "";
+				}
+			};
 		}
 
 		this.entityQuery = Lazy.of(() -> EntityQuery.create(declaredQuery, queryConfiguration.getSelector()));