From 39936c67fa45afd6a60e811e69ca0c12bc487b00 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 12 Mar 2019 11:25:11 +0100 Subject: [PATCH] #59 - Simplify CustomConversions bean construction. Original pull request: #70. --- .../r2dbc/config/AbstractR2dbcConfiguration.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java index 8d7f8fa..f6570c6 100644 --- a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java +++ b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.data.r2dbc.config; import io.r2dbc.spi.ConnectionFactory; +import java.util.Collections; import java.util.Optional; import org.springframework.context.annotation.Bean; @@ -149,10 +150,18 @@ public abstract class AbstractR2dbcConfiguration { */ @Bean public R2dbcCustomConversions r2dbcCustomConversions() { + return new R2dbcCustomConversions(getStoreConversions(), Collections.emptyList()); + } + + /** + * Returns the {@link Dialect}-specific {@link StoreConversions}. + * + * @return the {@link Dialect}-specific {@link StoreConversions}. + */ + protected StoreConversions getStoreConversions() { Dialect dialect = getDialect(connectionFactory()); - StoreConversions storeConversions = StoreConversions.of(dialect.getSimpleTypeHolder()); - return new R2dbcCustomConversions(storeConversions, R2dbcCustomConversions.STORE_CONVERTERS); + return StoreConversions.of(dialect.getSimpleTypeHolder(), R2dbcCustomConversions.STORE_CONVERTERS); } /**