Refine AOT fragment constructor parameter lookup.

Closes #3991

Author: mp911de

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

@@ -27,6 +27,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
@@ -120,7 +121,16 @@ protected void customizeClass(AotRepositoryClassBuilder classBuilder) {
 	@Override
 	protected void customizeConstructor(AotRepositoryConstructorBuilder constructorBuilder) {
 
-		constructorBuilder.addParameter("entityManager", EntityManager.class);
+		String entityManagerFactoryRef = getEntityManagerFactoryRef();
+
+		constructorBuilder.addParameter("entityManager", EntityManager.class, customizer -> {
+
+			customizer.bindToField().origin(
+					StringUtils.hasText(entityManagerFactoryRef)
+							? new RuntimeBeanReference(entityManagerFactoryRef, EntityManager.class)
+							: new RuntimeBeanReference(EntityManager.class));
+		});
+
 		constructorBuilder.addParameter("context", RepositoryFactoryBeanSupport.FragmentCreationContext.class);
 
 		Optional<Class<QueryEnhancerSelector>> queryEnhancerSelector = getQueryEnhancerSelectorClass();
@@ -135,6 +145,11 @@ protected void customizeConstructor(AotRepositoryConstructorBuilder constructorB
 		});
 	}
 
+	private String getEntityManagerFactoryRef() {
+		return context.getConfigurationSource().getAttribute("entityManagerFactoryRef")
+				.filter(it -> !"entityManagerFactory".equals(it)).orElse(null);
+	}
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private Optional<Class<QueryEnhancerSelector>> getQueryEnhancerSelectorClass() {
 		return (Optional) context.getConfigurationSource().getAttribute("queryEnhancerSelector", Class.class)

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

@@ -141,7 +141,7 @@ private boolean hasNamedQuery(ReturnedType returnedType, String queryName) {
 	private AotQueries buildStringQuery(Class<?> domainType, ReturnedType returnedType, QueryEnhancerSelector selector,
 			MergedAnnotation<Query> query, JpaQueryMethod queryMethod) {
 
-		UnaryOperator<String> operator = s -> s.replaceAll("#\\{#entityName}", domainType.getName());
+		UnaryOperator<String> operator = s -> s.replaceAll("#\\{#entityName}", domainType.getSimpleName());
 		boolean isNative = query.getBoolean("nativeQuery");
 		Function<String, DeclaredQuery> queryFunction = isNative ? DeclaredQuery::nativeQuery : DeclaredQuery::jpqlQuery;
 		queryFunction = operator.andThen(queryFunction);