From fb07912274c880cec9ec65405ae2d6ac527d4928 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 11 Jul 2019 10:20:07 +0200 Subject: [PATCH] DATAJDBC-395 - Polishing. Avoid line breaks in parameter lists. Original pull request: #160. --- .../config/AbstractJdbcConfiguration.java | 38 +++++-------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java index 5b052979..b01fb292 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java @@ -82,18 +82,12 @@ public abstract class AbstractJdbcConfiguration { ObjectProvider relationResolverProvider, Optional namingStrategy, JdbcConverter jdbcConverter) { - RelationResolver relationResolver = relationResolverProvider.getIfAvailable(() -> dataAccessStrategy( // - operations, // - jdbcConverter, // - jdbcMappingContext(namingStrategy)) // - ); + RelationResolver relationResolver = relationResolverProvider + .getIfAvailable(() -> dataAccessStrategy(operations, jdbcConverter, jdbcMappingContext(namingStrategy))); - return new BasicJdbcConverter( // - mappingContext, // - relationResolver, // - jdbcCustomConversions(), // - new DefaultJdbcTypeFactory(operations.getJdbcOperations()) // - ); + DefaultJdbcTypeFactory jdbcTypeFactory = new DefaultJdbcTypeFactory(operations.getJdbcOperations()); + + return new BasicJdbcConverter(mappingContext, relationResolver, jdbcCustomConversions(), jdbcTypeFactory); } /** @@ -124,18 +118,10 @@ public abstract class AbstractJdbcConfiguration { ObjectProvider dataAccessStrategyProvider, NamedParameterJdbcOperations operations, Optional namingStrategy, @Lazy JdbcConverter jdbcConverter) { - DataAccessStrategy dataAccessStrategy = dataAccessStrategyProvider.getIfAvailable(() -> dataAccessStrategy( // - operations, // - jdbcConverter, // - jdbcMappingContext(namingStrategy)) // - ); + DataAccessStrategy dataAccessStrategy = dataAccessStrategyProvider // + .getIfAvailable(() -> dataAccessStrategy(operations, jdbcConverter, jdbcMappingContext(namingStrategy))); - return new JdbcAggregateTemplate( // - publisher, // - context, // - converter, // - dataAccessStrategy // - ); + return new JdbcAggregateTemplate(publisher, context, converter, dataAccessStrategy); } /** @@ -151,12 +137,8 @@ public abstract class AbstractJdbcConfiguration { if (defaultDataAccessStrategy == null) { - defaultDataAccessStrategy = new DefaultDataAccessStrategy( // - new SqlGeneratorSource(context), // - context, // - jdbcConverter, // - operations // - ); + defaultDataAccessStrategy = // + new DefaultDataAccessStrategy(new SqlGeneratorSource(context), context, jdbcConverter, operations); } return defaultDataAccessStrategy; }