From be7c04cfed188117c29dce6ecf4a604cf56b8111 Mon Sep 17 00:00:00 2001
From: "Michael J. Simons" <michael@simons.ac>
Date: Fri, 21 Sep 2018 11:04:50 +0200
Subject: [PATCH] DATAJDBC-267 - Explicitly use the own custom conversions
 bean.

Original pull request: #89.
---
 .../jdbc/repository/config/JdbcConfiguration.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
index 5432325ed..b1157d5cc 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
@@ -33,31 +33,30 @@ import org.springframework.data.relational.core.mapping.RelationalMappingContext
  * @author Greg Turnquist
  * @author Jens Schauder
  * @author Mark Paluch
+ * @author Michael Simons
  */
 @Configuration
 public class JdbcConfiguration {
 
 	@Bean
-	protected RelationalMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy,
-			CustomConversions customConversions) {
+	protected RelationalMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
 
 		RelationalMappingContext mappingContext = new RelationalMappingContext(
 				namingStrategy.orElse(NamingStrategy.INSTANCE));
-		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
+		mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder());
 
 		return mappingContext;
 	}
 
 	@Bean
-	protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext,
-			CustomConversions customConversions) {
-		return new BasicRelationalConverter(mappingContext, customConversions);
+	protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
+		return new BasicRelationalConverter(mappingContext, jdbcCustomConversions());
 	}
 
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
 	 * {@link CustomConversions} will be registered with the
-	 * {@link #relationalConverter(RelationalMappingContext, CustomConversions)}. Returns an empty
+	 * {@link #relationalConverter(RelationalMappingContext)}. Returns an empty
 	 * {@link JdbcCustomConversions} instance by default.
 	 *
 	 * @return must not be {@literal null}.