Replace JdbcRepositoryFactoryBean autowiring with RuntimeBeanRefere…

…nces. We now specify runtime bean references to qualify the desired mapping context type instead of using autowiring that can match the wrong mapping context. Closes #1143
spring-projects · Jun 8, 2023 · 9b2032d · 9b2032d
1 parent 6b3819c
commit 9b2032d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...n/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java b/...n/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java
@@ -21,8 +21,12 @@
 import java.util.Locale;
 import java.util.Optional;
 
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.data.jdbc.core.convert.JdbcConverter;
+import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactoryBean;
+import org.springframework.data.relational.core.dialect.Dialect;
 import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;
@@ -74,6 +78,10 @@ public void postProcess(BeanDefinitionBuilder builder, RepositoryConfigurationSo
 
 		Optional<String> transactionManagerRef = source.getAttribute("transactionManagerRef");
 		builder.addPropertyValue("transactionManager", transactionManagerRef.orElse(DEFAULT_TRANSACTION_MANAGER_BEAN_NAME));
+
+		builder.addPropertyValue("mappingContext", new RuntimeBeanReference(JdbcMappingContext.class));
+		builder.addPropertyValue("dialect", new RuntimeBeanReference(Dialect.class));
+		builder.addPropertyValue("converter", new RuntimeBeanReference(JdbcConverter.class));
 	}
 
 	/**

diff --git a/...main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/...main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
@@ -95,7 +95,6 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
 		return jdbcRepositoryFactory;
 	}
 
-	@Autowired
 	public void setMappingContext(RelationalMappingContext mappingContext) {
 
 		Assert.notNull(mappingContext, "MappingContext must not be null");
@@ -104,7 +103,6 @@ public void setMappingContext(RelationalMappingContext mappingContext) {
 		this.mappingContext = mappingContext;
 	}
 
-	@Autowired
 	public void setDialect(Dialect dialect) {
 
 		Assert.notNull(dialect, "Dialect must not be null");
@@ -141,7 +139,6 @@ public void setJdbcOperations(NamedParameterJdbcOperations operations) {
 		this.operations = operations;
 	}
 
-	@Autowired
 	public void setConverter(JdbcConverter converter) {
 
 		Assert.notNull(converter, "JdbcConverter must not be null");