From 36192c4d975b94ab0d3bc9b6e2fa0722f26ffde4 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 25 Mar 2020 13:46:59 +0100 Subject: [PATCH] DATAJDBC-510 - Polishing. Minor formatting and removal of a deprecated constructor since this is for a major release anyway. Original pull request: #192. --- .../jdbc/core/convert/BasicJdbcConverter.java | 16 ---------------- .../repository/config/JdbcConfiguration.java | 1 + .../DefaultDataAccessStrategyUnitTests.java | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java index 926da94b..1d581078 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java @@ -96,22 +96,6 @@ public class BasicJdbcConverter extends BasicRelationalConverter implements Jdbc this.identifierProcessing = IdentifierProcessing.ANSI; } - /** - * Creates a new {@link BasicRelationalConverter} given {@link MappingContext}. - * - * @param context must not be {@literal null}. - * @param relationResolver used to fetch additional relations from the database. Must not be {@literal null}. - * @param typeFactory must not be {@literal null} - * @since 1.1 - */ - @Deprecated - public BasicJdbcConverter( - MappingContext, ? extends RelationalPersistentProperty> context, - RelationResolver relationResolver, CustomConversions conversions, JdbcTypeFactory typeFactory) { - - this(context, relationResolver, conversions, typeFactory, IdentifierProcessing.ANSI); - } - /** * Creates a new {@link BasicRelationalConverter} given {@link MappingContext}. * diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java index 3d96e19d..55d790f3 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java @@ -81,6 +81,7 @@ public class JdbcConfiguration { @Bean public RelationalConverter relationalConverter(RelationalMappingContext mappingContext, @Lazy RelationResolver relationalResolver, Dialect dialect) { + return new BasicJdbcConverter(mappingContext, relationalResolver, jdbcCustomConversions(), JdbcTypeFactory.unsupported(), dialect.getIdentifierProcessing()); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java index 0b1c41b6..881441da 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java @@ -117,6 +117,7 @@ public class DefaultDataAccessStrategyUnitTests { DelegatingDataAccessStrategy relationResolver = new DelegatingDataAccessStrategy(); Dialect dialect = HsqlDbDialect.INSTANCE; + JdbcConverter converter = new BasicJdbcConverter(context, relationResolver, new JdbcCustomConversions(Arrays.asList(BooleanToStringConverter.INSTANCE, StringToBooleanConverter.INSTANCE)), new DefaultJdbcTypeFactory(jdbcOperations), dialect.getIdentifierProcessing());