Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-267 - Explicitly use the own custom conversions bean.

Browse Source 
Original pull request: #89.
This commit is contained in:
Michael J. Simons
2018-09-21 11:04:50 +02:00
committed by Mark Paluch
parent 84de41a87d
commit be7c04cfed
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
View File

@@ -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}.