Skip to content

Commit 563f8bb

Browse files
schaudermp911de
schauder
authored and
mp911de
committed
Polishing.
Formatting. Original pull request #1893 See #1006
1 parent 78f4336 commit 563f8bb

27 files changed

+193
-168
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
*/
1616
package org.springframework.data.jdbc.core.convert;
1717

18-
import java.util.Optional;
19-
2018
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
21-
import org.springframework.lang.Nullable;
2219
import org.springframework.util.Assert;
2320

2421
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
7373
private final NamedParameterJdbcOperations operations;
7474
private final SqlParametersFactory sqlParametersFactory;
7575
private final InsertStrategyFactory insertStrategyFactory;
76-
7776
private final QueryMappingConfiguration queryMappingConfiguration;
7877

7978
/**
@@ -451,6 +450,7 @@ public <T> long count(Query query, Class<T> domainType) {
451450
}
452451

453452
private <T> RowMapper<? extends T> getRowMapper(Class<T> domainType) {
453+
454454
RowMapper<? extends T> targetRowMapper;
455455

456456
if ((targetRowMapper = queryMappingConfiguration.getRowMapper(domainType)) != null) {

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright 2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.springframework.data.jdbc.core.convert;
217

318
import org.springframework.jdbc.core.RowMapper;
@@ -9,7 +24,7 @@
924
*
1025
* @author Jens Schauder
1126
* @author Evgeni Dimitrov
12-
* @since 1.1
27+
* @since 4.0
1328
*/
1429
public interface QueryMappingConfiguration {
1530

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.springframework.data.domain.Pageable;
3333
import org.springframework.data.domain.Sort;
3434
import org.springframework.data.jdbc.core.convert.*;
35-
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
3635
import org.springframework.data.mapping.PersistentPropertyPath;
3736
import org.springframework.data.mapping.PropertyPath;
3837
import org.springframework.data.relational.core.conversion.IdValueSource;
@@ -77,8 +76,8 @@ public class MyBatisDataAccessStrategy implements DataAccessStrategy {
7776
* uses a {@link DefaultDataAccessStrategy}
7877
*/
7978
public static DataAccessStrategy createCombinedAccessStrategy(RelationalMappingContext context,
80-
JdbcConverter converter, NamedParameterJdbcOperations operations, SqlSession sqlSession,
81-
Dialect dialect, QueryMappingConfiguration queryMappingConfiguration) {
79+
JdbcConverter converter, NamedParameterJdbcOperations operations, SqlSession sqlSession, Dialect dialect,
80+
QueryMappingConfiguration queryMappingConfiguration) {
8281
return createCombinedAccessStrategy(context, converter, operations, sqlSession, NamespaceStrategy.DEFAULT_INSTANCE,
8382
dialect, queryMappingConfiguration);
8483
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.apache.commons.logging.Log;
2727
import org.apache.commons.logging.LogFactory;
28-
2928
import org.springframework.beans.BeansException;
3029
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
3130
import org.springframework.context.ApplicationContext;
@@ -42,7 +41,6 @@
4241
import org.springframework.data.jdbc.core.dialect.JdbcDialect;
4342
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
4443
import org.springframework.data.jdbc.core.mapping.JdbcSimpleTypes;
45-
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
4644
import org.springframework.data.mapping.model.SimpleTypeHolder;
4745
import org.springframework.data.relational.RelationalManagedTypes;
4846
import org.springframework.data.relational.core.conversion.RelationalConverter;
@@ -229,8 +227,7 @@ public DataAccessStrategy dataAccessStrategyBean(NamedParameterJdbcOperations op
229227
SqlGeneratorSource sqlGeneratorSource = new SqlGeneratorSource(context, jdbcConverter, dialect);
230228
DataAccessStrategyFactory factory = new DataAccessStrategyFactory(sqlGeneratorSource, jdbcConverter, operations,
231229
new SqlParametersFactory(context, jdbcConverter), new InsertStrategyFactory(operations, dialect),
232-
this.queryMappingConfiguration
233-
);
230+
this.queryMappingConfiguration);
234231

235232
return factory.create();
236233
}
@@ -254,7 +251,8 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
254251
this.applicationContext = applicationContext;
255252
}
256253

257-
public void setQueryMappingConfiguration(Optional<QueryMappingConfiguration> queryMappingConfiguration) throws BeansException {
254+
public void setQueryMappingConfiguration(Optional<QueryMappingConfiguration> queryMappingConfiguration)
255+
throws BeansException {
258256
this.queryMappingConfiguration = queryMappingConfiguration.orElse(QueryMappingConfiguration.EMPTY);
259257
}
260258

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.springframework.context.annotation.Configuration;
2424
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
2525
import org.springframework.data.jdbc.core.convert.JdbcConverter;
26+
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
2627
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
2728
import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy;
28-
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
2929
import org.springframework.data.relational.core.dialect.Dialect;
3030
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
3131

@@ -48,6 +48,7 @@ public class MyBatisJdbcConfiguration extends AbstractJdbcConfiguration {
4848
public DataAccessStrategy dataAccessStrategyBean(NamedParameterJdbcOperations operations, JdbcConverter jdbcConverter,
4949
JdbcMappingContext context, Dialect dialect) {
5050

51-
return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, jdbcConverter, operations, session, dialect, queryMappingConfiguration.orElse(QueryMappingConfiguration.EMPTY));
51+
return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, jdbcConverter, operations, session, dialect,
52+
queryMappingConfiguration.orElse(QueryMappingConfiguration.EMPTY));
5253
}
5354
}

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

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
import org.springframework.lang.Nullable;
2929

3030
/**
31-
* This {@link RowMapperFactory} implementation extends the {@link DefaultRowMapperFactory}
32-
* by adding the capabilities to load {@link RowMapper} or {@link ResultSetExtractor} beans by
33-
* their names in {@link BeanFactory}.
31+
* This {@link RowMapperFactory} implementation extends the {@link DefaultRowMapperFactory} by adding the capabilities
32+
* to load {@link RowMapper} or {@link ResultSetExtractor} beans by their names in {@link BeanFactory}.
3433
*
3534
* @author Mark Paluch
3635
* @author Jens Schauder
@@ -39,38 +38,36 @@
3938
@SuppressWarnings("unchecked")
4039
public class BeanFactoryAwareRowMapperFactory extends DefaultRowMapperFactory {
4140

42-
private final @Nullable BeanFactory beanFactory;
41+
private final @Nullable BeanFactory beanFactory;
4342

44-
public BeanFactoryAwareRowMapperFactory(
45-
RelationalMappingContext context,
46-
JdbcConverter converter,
47-
QueryMappingConfiguration queryMappingConfiguration,
48-
EntityCallbacks entityCallbacks,
49-
ApplicationEventPublisher publisher,
50-
@Nullable BeanFactory beanFactory
51-
) {
52-
super(context, converter, queryMappingConfiguration, entityCallbacks, publisher);
43+
public BeanFactoryAwareRowMapperFactory(RelationalMappingContext context, JdbcConverter converter,
44+
QueryMappingConfiguration queryMappingConfiguration, EntityCallbacks entityCallbacks,
45+
ApplicationEventPublisher publisher, @Nullable BeanFactory beanFactory) {
5346

54-
this.beanFactory = beanFactory;
55-
}
47+
super(context, converter, queryMappingConfiguration, entityCallbacks, publisher);
5648

57-
@Override
58-
public RowMapper<Object> getRowMapper(String reference) {
59-
if (beanFactory == null) {
60-
throw new IllegalStateException(
61-
"Cannot resolve RowMapper bean reference '" + reference + "'; BeanFactory is not configured.");
62-
}
49+
this.beanFactory = beanFactory;
50+
}
6351

64-
return beanFactory.getBean(reference, RowMapper.class);
65-
}
52+
@Override
53+
public RowMapper<Object> getRowMapper(String reference) {
6654

67-
@Override
68-
public ResultSetExtractor<Object> getResultSetExtractor(String reference) {
69-
if (beanFactory == null) {
70-
throw new IllegalStateException(
71-
"Cannot resolve ResultSetExtractor bean reference '" + reference + "'; BeanFactory is not configured.");
72-
}
55+
if (beanFactory == null) {
56+
throw new IllegalStateException(
57+
"Cannot resolve RowMapper bean reference '" + reference + "'; BeanFactory is not configured.");
58+
}
7359

74-
return beanFactory.getBean(reference, ResultSetExtractor.class);
75-
}
60+
return beanFactory.getBean(reference, RowMapper.class);
61+
}
62+
63+
@Override
64+
public ResultSetExtractor<Object> getResultSetExtractor(String reference) {
65+
66+
if (beanFactory == null) {
67+
throw new IllegalStateException(
68+
"Cannot resolve ResultSetExtractor bean reference '" + reference + "'; BeanFactory is not configured.");
69+
}
70+
71+
return beanFactory.getBean(reference, ResultSetExtractor.class);
72+
}
7673
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ protected Object getTargetRepository(RepositoryInformation repositoryInformation
124124
RelationalPersistentEntity<?> persistentEntity = context
125125
.getRequiredPersistentEntity(repositoryInformation.getDomainType());
126126

127-
return getTargetRepositoryViaReflection(repositoryInformation, template, persistentEntity,
128-
converter);
127+
return getTargetRepositoryViaReflection(repositoryInformation, template, persistentEntity, converter);
129128
}
130129

131130
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.data.jdbc.core.convert.DataAccessStrategyFactory;
2626
import org.springframework.data.jdbc.core.convert.InsertStrategyFactory;
2727
import org.springframework.data.jdbc.core.convert.JdbcConverter;
28+
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
2829
import org.springframework.data.jdbc.core.convert.SqlGeneratorSource;
2930
import org.springframework.data.jdbc.core.convert.SqlParametersFactory;
30-
import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
3131
import org.springframework.data.mapping.callback.EntityCallbacks;
3232
import org.springframework.data.relational.core.dialect.Dialect;
3333
import org.springframework.data.relational.core.mapping.RelationalMappingContext;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ void acrossModules() {
6161

6262
JavaClasses importedClasses = new ClassFileImporter().withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
6363
.importPackages( //
64-
"org.springframework.data.jdbc", // Spring Data Relational
64+
"org.springframework.data.jdbc", // Spring Data JDBC
6565
"org.springframework.data.relational", // Spring Data Relational
6666
"org.springframework.data" // Spring Data Commons
67-
)
67+
).that(onlySpringData()) //
6868
.that(ignore(AuditingHandlerBeanDefinitionParser.class)) //
6969
.that(ignorePackage("org.springframework.data.aot.hint")) // ignoring aot, since it causes cycles in commons
7070
.that(ignorePackage("org.springframework.data.aot")); // ignoring aot, since it causes cycles in commons

0 commit comments

Comments
 (0)