Use named and typed RuntimeBeanReference for shared EntityManager injection.

We now declare the target type for RuntimeBeanReference to indicate the desired target type so that SmartFactoryBeans can be used for property value injection of the shared EntityManager.

See #3926

Author: mp911de

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.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.PersistenceContext;
@@ -45,6 +46,7 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -138,7 +140,8 @@ public void postProcess(BeanDefinitionBuilder builder, RepositoryConfigurationSo
 		Optional<String> transactionManagerRef = source.getAttribute("transactionManagerRef");
 		builder.addPropertyValue("transactionManager", transactionManagerRef.orElse(DEFAULT_TRANSACTION_MANAGER_BEAN_NAME));
 		if (entityManagerRefs.containsKey(source)) {
-			builder.addPropertyReference("entityManager", entityManagerRefs.get(source));
+			builder.addPropertyValue("entityManager",
+					new RuntimeBeanReference(entityManagerRefs.get(source), EntityManager.class));
 		}
 		builder.addPropertyValue(ESCAPE_CHARACTER_PROPERTY, getEscapeCharacter(source).orElse('\\'));
 		builder.addPropertyReference("mappingContext", JPA_MAPPING_CONTEXT_BEAN_NAME);
@@ -235,14 +238,10 @@ private void registerSharedEntityMangerIfNotAlreadyRegistered(BeanDefinitionRegi
 		String entityManagerBeanRef = getEntityManagerBeanRef(config);
 		String sharedEntityManagerBeanRef = lookupSharedEntityManagerBeanRef(entityManagerBeanRef, registry);
 
-		// TODO: Remove once Cannot convert value of type 'jdk.proxy2.$Proxy129 implementing
-		// org.hibernate.SessionFactory,org.springframework.orm.jpa.EntityManagerFactoryInfo' to required type
-		// 'jakarta.persistence.EntityManager' for property 'entityManager': no matching editors or conversion strategy
-		// found is fixed.
-		/*if (sharedEntityManagerBeanRef != null) {
+		if (sharedEntityManagerBeanRef != null) {
 			entityManagerRefs.put(config, sharedEntityManagerBeanRef);
 			return;
-		} */
+		}
 
 		String entityManagerBeanName = "jpaSharedEM_" + entityManagerBeanRef;
 

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

@@ -32,9 +32,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.test.tools.TestCompiler;
@@ -47,7 +45,6 @@
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
 import org.springframework.data.repository.query.ValueExpressionDelegate;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -77,16 +74,6 @@ EnableJpaRepositories.class, new DefaultResourceLoader(), new StandardEnvironmen
 						Mockito.mock(BeanDefinitionRegistry.class), DefaultBeanNameGenerator.INSTANCE));
 	}
 
-	// TODO: Remove once Cannot convert value of type 'jdk.proxy2.$Proxy129 implementing
-	// org.hibernate.SessionFactory,org.springframework.orm.jpa.EntityManagerFactoryInfo' to required type
-	// 'jakarta.persistence.EntityManager' for property 'entityManager': no matching editors or conversion strategy found
-	// is fixed.
-	@Bean
-	@Primary
-	EntityManager entityManager(LocalContainerEntityManagerFactoryBean factoryBean) throws Exception {
-		return factoryBean.getObject(EntityManager.class);
-	}
-
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {