DATAJDBC-395 - AbstractJdbcConfiguration no longer registers a bean of type DataAccessStrategy.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-relational-parent</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Relational Parent</name>

spring-data-jdbc-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jdbc/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-jdbc</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 	</parent>
 
 	<properties>

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java

@@ -17,6 +17,7 @@
 
 import java.util.Optional;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,6 +52,8 @@
 @Configuration
 public abstract class AbstractJdbcConfiguration {
 
+	private DefaultDataAccessStrategy defaultDataAccessStrategy = null;
+
 	/**
 	 * Register a {@link RelationalMappingContext} and apply an optional {@link NamingStrategy}.
 	 *
@@ -76,17 +79,22 @@ public JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStra
 	 */
 	@Bean
 	public JdbcConverter jdbcConverter(RelationalMappingContext mappingContext, NamedParameterJdbcOperations operations,
-			@Lazy RelationResolver relationResolver) {
+			ObjectProvider<RelationResolver> relationResolverProvider, Optional<NamingStrategy> namingStrategy,
+			JdbcConverter jdbcConverter) {
+
+		RelationResolver relationResolver = relationResolverProvider
+				.getIfAvailable(() -> dataAccessStrategy(operations, jdbcConverter, jdbcMappingContext(namingStrategy)));
+
+		DefaultJdbcTypeFactory jdbcTypeFactory = new DefaultJdbcTypeFactory(operations.getJdbcOperations());
 
-		return new BasicJdbcConverter(mappingContext, relationResolver, jdbcCustomConversions(),
-				new DefaultJdbcTypeFactory(operations.getJdbcOperations()));
+		return new BasicJdbcConverter(mappingContext, relationResolver, jdbcCustomConversions(), jdbcTypeFactory);
 	}
 
 	/**
 	 * Register custom {@link Converter}s in a {@link JdbcCustomConversions} object if required. These
 	 * {@link JdbcCustomConversions} will be registered with the
-	 * {@link #jdbcConverter(RelationalMappingContext, NamedParameterJdbcOperations, RelationResolver)}. Returns an empty
-	 * {@link JdbcCustomConversions} instance by default.
+	 * {@link #jdbcConverter(RelationalMappingContext, NamedParameterJdbcOperations, ObjectProvider, Optional, JdbcConverter)}.
+	 * Returns an empty {@link JdbcCustomConversions} instance by default.
 	 *
 	 * @return must not be {@literal null}.
 	 */
@@ -106,26 +114,33 @@ public JdbcCustomConversions jdbcCustomConversions() {
 	 */
 	@Bean
 	public JdbcAggregateTemplate jdbcAggregateTemplate(ApplicationEventPublisher publisher,
-			RelationalMappingContext context, JdbcConverter converter, DataAccessStrategy dataAccessStrategy) {
+			RelationalMappingContext context, JdbcConverter converter,
+			ObjectProvider<DataAccessStrategy> dataAccessStrategyProvider, NamedParameterJdbcOperations operations,
+			Optional<NamingStrategy> namingStrategy, @Lazy JdbcConverter jdbcConverter) {
+
+		DataAccessStrategy dataAccessStrategy = dataAccessStrategyProvider //
+				.getIfAvailable(() -> dataAccessStrategy(operations, jdbcConverter, jdbcMappingContext(namingStrategy)));
 
 		return new JdbcAggregateTemplate(publisher, context, converter, dataAccessStrategy);
 	}
 
 	/**
-	 * Register a {@link DataAccessStrategy} as a bean for reuse in the {@link JdbcAggregateOperations} and the
-	 * {@link RelationalConverter}.
+	 * Create a {@link DataAccessStrategy} for reuse in the {@link JdbcAggregateOperations} and the
+	 * {@link RelationalConverter}. It will return the same instance if called multiple times, regardless of the arguments
+	 * provided. Register a bean of type {@link DataAccessStrategy} if your use case requires a more specialized
+	 * DataAccessStrategy.
 	 *
-	 * @param operations
-	 * @param namingStrategy
-	 * @param jdbcConverter
-	 * @return
+	 * @return Guaranteed to be not {@literal null}.
 	 */
-	@Bean
-	public DataAccessStrategy dataAccessStrategy(NamedParameterJdbcOperations operations,
-			Optional<NamingStrategy> namingStrategy, JdbcConverter jdbcConverter) {
+	private DataAccessStrategy dataAccessStrategy(NamedParameterJdbcOperations operations, JdbcConverter jdbcConverter,
+			JdbcMappingContext context) {
+
+		if (defaultDataAccessStrategy == null) {
 
-		JdbcMappingContext context = jdbcMappingContext(namingStrategy);
-		return new DefaultDataAccessStrategy(new SqlGeneratorSource(context), context, jdbcConverter, operations);
+			defaultDataAccessStrategy = //
+					new DefaultDataAccessStrategy(new SqlGeneratorSource(context), context, jdbcConverter, operations);
+		}
+		return defaultDataAccessStrategy;
 	}
 
 }

spring-data-relational/pom.xml

@@ -5,15 +5,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-relational</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 
 	<name>Spring Data Relational</name>
 	<description>Spring Data Relational support</description>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.DATAJDBC-395-SNAPSHOT</version>
 	</parent>
 
 	<properties>

src/main/asciidoc/jdbc.adoc

@@ -153,16 +153,16 @@ References between those should be encoded as simple `id` values, which should m
 [[jdbc.entity-persistence.custom-converters]]
 === Custom converters
 
-Custom converters can be registered, for types that are not supported by default, by inheriting your configuration from `JdbcConfiguration` and overwriting the method `jdbcCustomConversions()`.
+Custom converters can be registered, for types that are not supported by default, by inheriting your configuration from `AbstractJdbcConfiguration` and overwriting the method `jdbcCustomConversions()`.
 
 ====
 [source, java]
 ----
 @Configuration
-public class DataJdbcConfiguration extends JdbcConfiguration {
+public class DataJdbcConfiguration extends AbstractJdbcConfiguration {
 
     @Override
-    protected JdbcCustomConversions jdbcCustomConversions() {
+    public JdbcCustomConversions jdbcCustomConversions() {
 
       return new JdbcCustomConversions(Collections.singletonList(TimestampTzToDateConverter.INSTANCE));