From 4553ecf1ad4026b64e520b1b748516798ecb7dfd Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 5 Nov 2018 13:40:23 +0000 Subject: [PATCH] Make @Bean methods in Spring Data JDBC public See https://github.com/spring-projects/spring-data-jdbc/pull/100 for a change in Spring Data that makes this redundant, but might not be available till after Lovelace. --- .../JdbcRepositoriesAutoConfiguration.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java index afd2974f9884..c367030382d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.data.jdbc; +import java.util.Optional; + import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -25,9 +27,13 @@ import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.data.jdbc.core.convert.JdbcCustomConversions; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; import org.springframework.data.jdbc.repository.config.JdbcConfiguration; import org.springframework.data.jdbc.repository.config.JdbcRepositoryConfigExtension; +import org.springframework.data.relational.core.conversion.RelationalConverter; +import org.springframework.data.relational.core.mapping.NamingStrategy; +import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** @@ -59,6 +65,25 @@ static class JdbcRepositoriesConfiguration { @ConditionalOnMissingBean(JdbcConfiguration.class) static class SpringBootJdbcConfiguration extends JdbcConfiguration { + // Remove these public methods when they are made + // public in Spring Data + @Override + public JdbcCustomConversions jdbcCustomConversions() { + return super.jdbcCustomConversions(); + } + + @Override + public RelationalMappingContext jdbcMappingContext( + Optional namingStrategy) { + return super.jdbcMappingContext(namingStrategy); + } + + @Override + public RelationalConverter relationalConverter( + RelationalMappingContext mappingContext) { + return super.relationalConverter(mappingContext); + } + } }