Skip to content

Commit b656bad

Browse files
mipo256mipo256
committed
1 parent 0500442 commit b656bad

31 files changed

+74
-73
lines changed

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ private RowMapper<?> getMapEntityRowMapper(PersistentPropertyPathExtension path,
327327
SqlIdentifier keyColumn = path.getQualifierColumn();
328328
Assert.notNull(keyColumn, () -> "KeyColumn must not be null for " + path);
329329

330-
return new MapEntityRowMapper<>(path, converter, identifier, keyColumn, getIdentifierProcessing());
330+
return new MapEntityRowMapper<>(path, converter, identifier, keyColumn);
331331
}
332332

333333
private IdentifierProcessing getIdentifierProcessing() {

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingBatchInsertStrategy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Object[] execute(String sql, SqlParameterSource[] sqlParameterSources) {
7979
Map<String, Object> keys = keyList.get(i);
8080
if (keys.size() > 1) {
8181
if (idColumn != null) {
82-
ids[i] = keys.get(idColumn.getReference(dialect.getIdentifierProcessing()));
82+
ids[i] = keys.get(idColumn.getReference());
8383
}
8484
} else {
8585
ids[i] = keys.entrySet().stream().findFirst() //
@@ -93,7 +93,7 @@ public Object[] execute(String sql, SqlParameterSource[] sqlParameterSources) {
9393
private String[] getKeyColumnNames() {
9494

9595
return Optional.ofNullable(idColumn)
96-
.map(idColumn -> new String[] { idColumn.getReference(dialect.getIdentifierProcessing()) })
96+
.map(idColumn -> new String[] { idColumn.getReference() })
9797
.orElse(new String[0]);
9898
}
9999
}

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingInsertStrategy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ public Object execute(String sql, SqlParameterSource sqlParameterSource) {
7979
return null;
8080
}
8181

82-
return keys.get(idColumn.getReference(dialect.getIdentifierProcessing()));
82+
return keys.get(idColumn.getReference());
8383
}
8484
}
8585

8686
private String[] getKeyColumnNames() {
8787
return Optional.ofNullable(idColumn)
88-
.map(idColumn -> new String[] { idColumn.getReference(dialect.getIdentifierProcessing()) })
88+
.map(idColumn -> new String[] { idColumn.getReference() })
8989
.orElse(new String[0]);
9090
}
9191
}

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcBackReferencePropertyValueProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class JdbcBackReferencePropertyValueProvider implements PropertyValueProvider<Re
5050
@Override
5151
public <T> T getPropertyValue(RelationalPersistentProperty property) {
5252
return (T) resultSet
53-
.getObject(basePath.extendBy(property).getReverseColumnNameAlias().getReference(identifierProcessing));
53+
.getObject(basePath.extendBy(property).getReverseColumnNameAlias().getReference());
5454
}
5555

5656
public JdbcBackReferencePropertyValueProvider extendBy(RelationalPersistentProperty property) {

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcPropertyValueProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public boolean hasProperty(RelationalPersistentProperty property) {
6262
}
6363

6464
private String getColumnName(RelationalPersistentProperty property) {
65-
return basePath.extendBy(property).getColumnAlias().getReference(identifierProcessing);
65+
return basePath.extendBy(property).getColumnAlias().getReference();
6666
}
6767

6868
public JdbcPropertyValueProvider extendBy(RelationalPersistentProperty property) {

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/MapEntityRowMapper.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,26 @@
3131
* {@link Map.Entry} is delegated to a {@link RowMapper} provided in the constructor.
3232
*
3333
* @author Jens Schauder
34+
* @author Mikhail Polivakha
3435
*/
3536
class MapEntityRowMapper<T> implements RowMapper<Map.Entry<Object, T>> {
3637

3738
private final PersistentPropertyPathExtension path;
3839
private final JdbcConverter converter;
3940
private final Identifier identifier;
4041
private final SqlIdentifier keyColumn;
41-
private final IdentifierProcessing identifierProcessing;
42-
43-
MapEntityRowMapper(PersistentPropertyPathExtension path, JdbcConverter converter, Identifier identifier,
44-
SqlIdentifier keyColumn, IdentifierProcessing identifierProcessing) {
4542

43+
MapEntityRowMapper(PersistentPropertyPathExtension path, JdbcConverter converter, Identifier identifier, SqlIdentifier keyColumn) {
4644
this.path = path;
4745
this.converter = converter;
4846
this.identifier = identifier;
4947
this.keyColumn = keyColumn;
50-
this.identifierProcessing = identifierProcessing;
5148
}
5249

5350
@Override
5451
public Map.Entry<Object, T> mapRow(ResultSet rs, int rowNum) throws SQLException {
5552

56-
Object key = rs.getObject(keyColumn.getReference(identifierProcessing));
53+
Object key = rs.getObject(keyColumn.getReference());
5754
return new HashMap.SimpleEntry<>(key, mapEntity(rs, key));
5855
}
5956

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ private Column getVersionColumn() {
705705
}
706706

707707
private String renderReference(SqlIdentifier identifier) {
708-
return identifier.getReference(renderContext.getIdentifierProcessing());
708+
return identifier.getReference();
709709
}
710710

711711
private List<OrderByField> extractOrderByFields(Sort sort) {

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSource.java

+13-6
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,23 @@
3030
* {@link SqlIdentifier} instead of {@link String} for names.
3131
*
3232
* @author Jens Schauder
33+
* @author Mikhail Polivakha
3334
* @since 2.0
3435
*/
3536
class SqlIdentifierParameterSource extends AbstractSqlParameterSource {
3637

37-
private final IdentifierProcessing identifierProcessing;
38-
private final Set<SqlIdentifier> identifiers = new HashSet<>();
39-
private final Map<String, Object> namesToValues = new HashMap<>();
38+
private IdentifierProcessing identifierProcessing;
39+
private final Set<SqlIdentifier> identifiers;
40+
private final Map<String, Object> namesToValues;
4041

42+
@Deprecated
4143
SqlIdentifierParameterSource(IdentifierProcessing identifierProcessing) {
42-
this.identifierProcessing = identifierProcessing;
44+
this();
45+
}
46+
47+
SqlIdentifierParameterSource() {
48+
this.identifiers = new HashSet<>();
49+
this.namesToValues = new HashMap<>();
4350
}
4451

4552
@Override
@@ -68,7 +75,7 @@ void addValue(SqlIdentifier name, Object value) {
6875
void addValue(SqlIdentifier identifier, Object value, int sqlType) {
6976

7077
identifiers.add(identifier);
71-
String name = identifier.getReference(identifierProcessing);
78+
String name = identifier.getReference();
7279
namesToValues.put(name, value);
7380
registerSqlType(name, sqlType);
7481
}
@@ -77,7 +84,7 @@ void addAll(SqlIdentifierParameterSource others) {
7784

7885
for (SqlIdentifier identifier : others.getIdentifiers()) {
7986

80-
String name = identifier.getReference(identifierProcessing);
87+
String name = identifier.getReference();
8188
addValue(identifier, others.getValue(name), others.getSqlType(name));
8289
}
8390
}

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlParametersFactory.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,21 @@
4242
*
4343
* @author Jens Schauder
4444
* @author Chirag Tailor
45+
* @author Mikhail Polivakha
4546
* @since 2.4
4647
*/
4748
public class SqlParametersFactory {
4849
private final RelationalMappingContext context;
4950
private final JdbcConverter converter;
50-
private final Dialect dialect;
5151

52+
@Deprecated
5253
public SqlParametersFactory(RelationalMappingContext context, JdbcConverter converter, Dialect dialect) {
54+
this(context, converter);
55+
}
56+
57+
public SqlParametersFactory(RelationalMappingContext context, JdbcConverter converter) {
5358
this.context = context;
5459
this.converter = converter;
55-
this.dialect = dialect;
5660
}
5761

5862
/**
@@ -72,7 +76,7 @@ <T> SqlIdentifierParameterSource forInsert(T instance, Class<T> domainType, Iden
7276

7377
RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(domainType);
7478
SqlIdentifierParameterSource parameterSource = getParameterSource(instance, persistentEntity, "",
75-
PersistentProperty::isIdProperty, dialect.getIdentifierProcessing());
79+
PersistentProperty::isIdProperty);
7680

7781
identifier.forEach((name, value, type) -> addConvertedPropertyValue(parameterSource, name, value, type));
7882

@@ -95,8 +99,7 @@ <T> SqlIdentifierParameterSource forInsert(T instance, Class<T> domainType, Iden
9599
*/
96100
<T> SqlIdentifierParameterSource forUpdate(T instance, Class<T> domainType) {
97101

98-
return getParameterSource(instance, getRequiredPersistentEntity(domainType), "", Predicates.includeAll(),
99-
dialect.getIdentifierProcessing());
102+
return getParameterSource(instance, getRequiredPersistentEntity(domainType), "", Predicates.includeAll());
100103
}
101104

102105
/**
@@ -110,7 +113,7 @@ <T> SqlIdentifierParameterSource forUpdate(T instance, Class<T> domainType) {
110113
*/
111114
<T> SqlIdentifierParameterSource forQueryById(Object id, Class<T> domainType, SqlIdentifier name) {
112115

113-
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource(dialect.getIdentifierProcessing());
116+
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource();
114117

115118
addConvertedPropertyValue( //
116119
parameterSource, //
@@ -131,7 +134,7 @@ <T> SqlIdentifierParameterSource forQueryById(Object id, Class<T> domainType, Sq
131134
*/
132135
<T> SqlIdentifierParameterSource forQueryByIds(Iterable<?> ids, Class<T> domainType) {
133136

134-
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource(dialect.getIdentifierProcessing());
137+
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource();
135138

136139
addConvertedPropertyValuesAsList(parameterSource, getRequiredPersistentEntity(domainType).getRequiredIdProperty(),
137140
ids);
@@ -148,7 +151,7 @@ <T> SqlIdentifierParameterSource forQueryByIds(Iterable<?> ids, Class<T> domainT
148151
*/
149152
SqlIdentifierParameterSource forQueryByIdentifier(Identifier identifier) {
150153

151-
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource(dialect.getIdentifierProcessing());
154+
SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource();
152155

153156
identifier.toMap()
154157
.forEach((name, value) -> addConvertedPropertyValue(parameterSource, name, value, value.getClass()));
@@ -228,9 +231,9 @@ private <S> RelationalPersistentEntity<S> getRequiredPersistentEntity(Class<S> d
228231

229232
private <S, T> SqlIdentifierParameterSource getParameterSource(@Nullable S instance,
230233
RelationalPersistentEntity<S> persistentEntity, String prefix,
231-
Predicate<RelationalPersistentProperty> skipProperty, IdentifierProcessing identifierProcessing) {
234+
Predicate<RelationalPersistentProperty> skipProperty) {
232235

233-
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(identifierProcessing);
236+
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
234237

235238
PersistentPropertyAccessor<S> propertyAccessor = instance != null ? persistentEntity.getPropertyAccessor(instance)
236239
: NoValuePropertyAccessor.instance();
@@ -249,8 +252,7 @@ private <S, T> SqlIdentifierParameterSource getParameterSource(@Nullable S insta
249252
Object value = propertyAccessor.getProperty(property);
250253
RelationalPersistentEntity<?> embeddedEntity = context.getPersistentEntity(property.getType());
251254
SqlIdentifierParameterSource additionalParameters = getParameterSource((T) value,
252-
(RelationalPersistentEntity<T>) embeddedEntity, prefix + property.getEmbeddedPrefix(), skipProperty,
253-
identifierProcessing);
255+
(RelationalPersistentEntity<T>) embeddedEntity, prefix + property.getEmbeddedPrefix(), skipProperty);
254256
parameters.addAll(additionalParameters);
255257
} else {
256258

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static DataAccessStrategy createCombinedAccessStrategy(RelationalMappingC
100100
asList(myBatisDataAccessStrategy, delegatingDataAccessStrategy));
101101

102102
SqlGeneratorSource sqlGeneratorSource = new SqlGeneratorSource(context, converter, dialect);
103-
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter, dialect);
103+
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter);
104104
InsertStrategyFactory insertStrategyFactory = new InsertStrategyFactory(operations,
105105
new BatchJdbcOperations(operations.getJdbcOperations()), dialect);
106106
DefaultDataAccessStrategy defaultDataAccessStrategy = new DefaultDataAccessStrategy( //

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public JdbcAggregateTemplate jdbcAggregateTemplate(ApplicationContext applicatio
168168
public DataAccessStrategy dataAccessStrategyBean(NamedParameterJdbcOperations operations, JdbcConverter jdbcConverter,
169169
JdbcMappingContext context, Dialect dialect) {
170170
return new DefaultDataAccessStrategy(new SqlGeneratorSource(context, jdbcConverter, dialect), context,
171-
jdbcConverter, operations, new SqlParametersFactory(context, jdbcConverter, dialect),
171+
jdbcConverter, operations, new SqlParametersFactory(context, jdbcConverter),
172172
new InsertStrategyFactory(operations, new BatchJdbcOperations(operations.getJdbcOperations()), dialect));
173173
}
174174

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ public void afterPropertiesSet() {
181181

182182
SqlGeneratorSource sqlGeneratorSource = new SqlGeneratorSource(this.mappingContext, this.converter,
183183
this.dialect);
184-
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(this.mappingContext, this.converter,
185-
this.dialect);
184+
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(this.mappingContext, this.converter);
186185
InsertStrategyFactory insertStrategyFactory = new InsertStrategyFactory(this.operations,
187186
new BatchJdbcOperations(this.operations.getJdbcOperations()), this.dialect);
188187
return new DefaultDataAccessStrategy(sqlGeneratorSource, this.mappingContext, this.converter,

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void before() {
7474
relationResolver.setDelegate(accessStrategy);
7575

7676
when(sqlParametersFactory.forInsert(any(), any(), any(), any()))
77-
.thenReturn(new SqlIdentifierParameterSource(dialect.getIdentifierProcessing()));
77+
.thenReturn(new SqlIdentifierParameterSource());
7878
when(insertStrategyFactory.insertStrategy(any(), any())).thenReturn(mock(InsertStrategy.class));
7979
when(insertStrategyFactory.batchInsertStrategy(any(), any())).thenReturn(mock(BatchInsertStrategy.class));
8080
}

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdGeneratingBatchInsertStrategyTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,17 @@ class IdGeneratingBatchInsertStrategyTest {
4444
BatchJdbcOperations batchJdbcOperations = mock(BatchJdbcOperations.class);
4545
InsertStrategy insertStrategy = mock(InsertStrategy.class);
4646
String sql = "some sql";
47-
SqlParameterSource[] sqlParameterSources = new SqlParameterSource[] {
48-
new SqlIdentifierParameterSource(identifierProcessing) };
47+
SqlParameterSource[] sqlParameterSources = new SqlParameterSource[] {new SqlIdentifierParameterSource() };
4948

5049
@Test
5150
void insertsSequentially_whenIdGenerationForBatchOperationsNotSupported() {
5251

5352
BatchInsertStrategy batchInsertStrategy = new IdGeneratingBatchInsertStrategy(insertStrategy,
5453
createDialect(identifierProcessing, true, false), batchJdbcOperations, idColumn);
5554

56-
SqlIdentifierParameterSource sqlParameterSource1 = new SqlIdentifierParameterSource(identifierProcessing);
55+
SqlIdentifierParameterSource sqlParameterSource1 = new SqlIdentifierParameterSource();
5756
sqlParameterSource1.addValue(SqlIdentifier.quoted("property1"), "value1");
58-
SqlIdentifierParameterSource sqlParameterSource2 = new SqlIdentifierParameterSource(identifierProcessing);
57+
SqlIdentifierParameterSource sqlParameterSource2 = new SqlIdentifierParameterSource();
5958
sqlParameterSource2.addValue(SqlIdentifier.quoted("property2"), "value2");
6059

6160
long id1 = 1L;

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdGeneratingInsertStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class IdGeneratingInsertStrategyTest {
4444
IdentifierProcessing identifierProcessing = IdentifierProcessing.ANSI;
4545
NamedParameterJdbcOperations namedParameterJdbcOperations = mock(NamedParameterJdbcOperations.class);
4646
String sql = "some sql";
47-
SqlParameterSource sqlParameterSource = new SqlIdentifierParameterSource(identifierProcessing);
47+
SqlParameterSource sqlParameterSource = new SqlIdentifierParameterSource();
4848

4949
@Test
5050
void insertsWithKeyHolderAndKeyColumnNames_whenDriverRequiresKeyColumnNames() {

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/InsertStrategyFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@
3232
*/
3333
class InsertStrategyFactoryTest {
3434

35-
IdentifierProcessing identifierProcessing = IdentifierProcessing.ANSI;
36-
3735
NamedParameterJdbcOperations namedParameterJdbcOperations = mock(NamedParameterJdbcOperations.class);
3836
BatchJdbcOperations batchJdbcOperations = mock(BatchJdbcOperations.class);
3937
InsertStrategyFactory insertStrategyFactory = new InsertStrategyFactory(namedParameterJdbcOperations,
4038
batchJdbcOperations, AnsiDialect.INSTANCE);
4139

4240
String sql = "some sql";
43-
SqlParameterSource sqlParameterSource = new SqlIdentifierParameterSource(identifierProcessing);
41+
SqlParameterSource sqlParameterSource = new SqlIdentifierParameterSource();
4442
SqlParameterSource[] sqlParameterSources = new SqlParameterSource[] { sqlParameterSource };
4543

4644
@Test

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSourceUnitTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SqlIdentifierParameterSourceUnitTests {
3535
@Test // DATAJDBC-386
3636
public void empty() {
3737

38-
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(identifierProcessing);
38+
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
3939

4040
assertSoftly(softly -> {
4141

@@ -49,7 +49,7 @@ public void empty() {
4949
@Test // DATAJDBC-386
5050
public void addSingleValue() {
5151

52-
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(identifierProcessing);
52+
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
5353

5454
parameters.addValue(SqlIdentifier.unquoted("key"), 23);
5555

@@ -68,7 +68,7 @@ public void addSingleValue() {
6868
@Test // DATAJDBC-386
6969
public void addSingleValueWithType() {
7070

71-
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(identifierProcessing);
71+
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
7272

7373
parameters.addValue(SqlIdentifier.unquoted("key"), 23, 42);
7474

@@ -88,11 +88,11 @@ public void addSingleValueWithType() {
8888
@Test // DATAJDBC-386
8989
public void addOtherDatabaseObjectIdentifierParameterSource() {
9090

91-
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(identifierProcessing);
91+
SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
9292
parameters.addValue(SqlIdentifier.unquoted("key1"), 111, 11);
9393
parameters.addValue(SqlIdentifier.unquoted("key2"), 111);
9494

95-
SqlIdentifierParameterSource parameters2 = new SqlIdentifierParameterSource(identifierProcessing);
95+
SqlIdentifierParameterSource parameters2 = new SqlIdentifierParameterSource();
9696
parameters2.addValue(SqlIdentifier.unquoted("key2"), 222, 22);
9797
parameters2.addValue(SqlIdentifier.unquoted("key3"), 222);
9898

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlParametersFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SqlParametersFactoryTest {
5353
RelationResolver relationResolver = mock(RelationResolver.class);
5454
BasicJdbcConverter converter = new BasicJdbcConverter(context, relationResolver);
5555
AnsiDialect dialect = AnsiDialect.INSTANCE;
56-
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter, dialect);
56+
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter);
5757

5858
@Test // DATAJDBC-412
5959
public void considersConfiguredWriteConverterForIdValueObjects_onRead() {
@@ -217,6 +217,6 @@ private SqlParametersFactory createSqlParametersFactoryWithConverters(List<?> co
217217
BasicJdbcConverter converter = new BasicJdbcConverter(context, relationResolver,
218218
new JdbcCustomConversions(converters), new DefaultJdbcTypeFactory(mock(JdbcOperations.class)),
219219
dialect.getIdentifierProcessing());
220-
return new SqlParametersFactory(context, converter, dialect);
220+
return new SqlParametersFactory(context, converter);
221221
}
222222
}

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void before() {
8383
JdbcConverter converter = new BasicJdbcConverter(context, delegatingDataAccessStrategy, new JdbcCustomConversions(),
8484
new DefaultJdbcTypeFactory(operations.getJdbcOperations()), dialect.getIdentifierProcessing());
8585
SqlGeneratorSource generatorSource = new SqlGeneratorSource(context, converter, dialect);
86-
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter, dialect);
86+
SqlParametersFactory sqlParametersFactory = new SqlParametersFactory(context, converter);
8787
InsertStrategyFactory insertStrategyFactory = new InsertStrategyFactory(operations,
8888
new BatchJdbcOperations(operations.getJdbcOperations()), dialect);
8989

0 commit comments

Comments
 (0)