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

Polishing.

Browse Source 
Simplify type and interface arrangement.

See #1601
Original pull request: #1617
This commit is contained in:
Mark Paluch
2023-09-26 11:34:26 +02:00
parent 7b27d0e08c
commit 8fa9e3e1d5
4 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/AggregateReader.java
View File

@@ -37,10 +37,10 @@ import org.springframework.data.relational.core.sqlgeneration.SingleQuerySqlGene
import org.springframework.data.relational.core.sqlgeneration.SqlGenerator;
import org.springframework.data.relational.domain.RowDocument;
import org.springframework.data.util.Streamable;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
* Reads complete Aggregates from the database, by generating appropriate SQL using a {@link SingleQuerySqlGenerator}
@@ -53,13 +53,14 @@ import org.springframework.util.Assert;
* @author Mark Paluch
* @since 3.2
*/
class AggregateReader<T> {
class AggregateReader<T> implements PathToColumnMapping {
private final RelationalPersistentEntity<T> aggregate;
private final Table table;
private final SqlGenerator sqlGenerator;
private final JdbcConverter converter;
private final NamedParameterJdbcOperations jdbcTemplate;
private final AliasFactory aliasFactory;
private final RowDocumentResultSetExtractor extractor;
AggregateReader(Dialect dialect, JdbcConverter converter, AliasFactory aliasFactory,
@@ -70,8 +71,25 @@ class AggregateReader<T> {
this.jdbcTemplate = jdbcTemplate;
this.table = Table.create(aggregate.getQualifiedTableName());
this.sqlGenerator = new SingleQuerySqlGenerator(converter.getMappingContext(), aliasFactory, dialect, aggregate);
this.extractor = new RowDocumentResultSetExtractor(converter.getMappingContext(),
createPathToColumnMapping(aliasFactory));
this.aliasFactory = aliasFactory;
this.extractor = new RowDocumentResultSetExtractor(converter.getMappingContext(), this);
}
@Override
public String column(AggregatePath path) {
String alias = aliasFactory.getColumnAlias(path);
if (alias == null) {
throw new IllegalStateException(String.format("Alias for '%s' must not be null", path));
}
return alias;
}
@Override
public String keyColumn(AggregatePath path) {
return aliasFactory.getKeyAlias(path);
}
@Nullable
@@ -84,30 +102,34 @@ class AggregateReader<T> {
@Nullable
public T findOne(Query query) {
MapSqlParameterSource parameterSource = new MapSqlParameterSource();
Condition condition = createCondition(query, parameterSource);
return jdbcTemplate.query(sqlGenerator.findAll(condition), parameterSource, this::extractZeroOrOne);
}
public List<T> findAll() {
return jdbcTemplate.query(sqlGenerator.findAll(), this::extractAll);
return doFind(query, this::extractZeroOrOne);
}
public List<T> findAllById(Iterable<?> ids) {
Collection<?> identifiers = ids instanceof Collection<?> idl ? idl : Streamable.of(ids).toList();
Query query = Query.query(Criteria.where(aggregate.getRequiredIdProperty().getName()).in(identifiers)).limit(1);
Query query = Query.query(Criteria.where(aggregate.getRequiredIdProperty().getName()).in(identifiers));
return findAll(query);
}
@SuppressWarnings("ConstantConditions")
public List<T> findAll() {
return jdbcTemplate.query(sqlGenerator.findAll(), this::extractAll);
}
public List<T> findAll(Query query) {
return doFind(query, this::extractAll);
}
@SuppressWarnings("ConstantConditions")
private <R> R doFind(Query query, ResultSetExtractor<R> extractor) {
MapSqlParameterSource parameterSource = new MapSqlParameterSource();
Condition condition = createCondition(query, parameterSource);
return jdbcTemplate.query(sqlGenerator.findAll(condition), parameterSource, this::extractAll);
String sql = sqlGenerator.findAll(condition);
return jdbcTemplate.query(sql, parameterSource, extractor);
}
@Nullable
@@ -128,7 +150,7 @@ class AggregateReader<T> {
*
* @param rs the {@link ResultSet} from which to extract the data. Must not be {(}@literal null}.
* @return a {@code List} of aggregates, fully converted.
* @throws SQLException
* @throws SQLException on underlying JDBC errors.
*/
private List<T> extractAll(ResultSet rs) throws SQLException {
@@ -146,10 +168,10 @@ class AggregateReader<T> {
* {@link RowDocumentResultSetExtractor} and the {@link JdbcConverter}. When used as a method reference this conforms
* to the {@link org.springframework.jdbc.core.ResultSetExtractor} contract.
*
* @param @param rs the {@link ResultSet} from which to extract the data. Must not be {(}@literal null}.
* @param rs the {@link ResultSet} from which to extract the data. Must not be {(}@literal null}.
* @return The single instance when the conversion results in exactly one instance. If the {@literal ResultSet} is
* empty, null is returned.
* @throws SQLException
* @throws SQLException on underlying JDBC errors.
* @throws IncorrectResultSizeDataAccessException when the conversion yields more than one instance.
*/
@Nullable
@@ -167,21 +189,4 @@ class AggregateReader<T> {
return null;
}
private PathToColumnMapping createPathToColumnMapping(AliasFactory aliasFactory) {
return new PathToColumnMapping() {
@Override
public String column(AggregatePath path) {
String alias = aliasFactory.getColumnAlias(path);
Assert.notNull(alias, () -> "alias for >" + path + "< must not be null");
return alias;
}
@Override
public String keyColumn(AggregatePath path) {
return aliasFactory.getKeyAlias(path);
}
};
}
}

2
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentResultSetExtractor.java
View File

@@ -159,7 +159,7 @@ class RowDocumentResultSetExtractor {
*/
private boolean hasNext;
RowDocumentIterator(RelationalPersistentEntity<?> entity, ResultSet resultSet) throws SQLException {
RowDocumentIterator(RelationalPersistentEntity<?> entity, ResultSet resultSet) {
ResultSetAdapter adapter = ResultSetAdapter.INSTANCE;

13
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SingleQueryDataAccessStrategy.java
View File

@@ -16,6 +16,7 @@
package org.springframework.data.jdbc.core.convert;
import java.util.List;
import java.util.Optional;
import org.springframework.data.domain.Pageable;
@@ -56,22 +57,22 @@ class SingleQueryDataAccessStrategy implements ReadingDataAccessStrategy {
}
@Override
public <T> Iterable<T> findAll(Class<T> domainType) {
public <T> List<T> findAll(Class<T> domainType) {
return getReader(domainType).findAll();
}
@Override
public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
public <T> List<T> findAllById(Iterable<?> ids, Class<T> domainType) {
return getReader(domainType).findAllById(ids);
}
@Override
public <T> Iterable<T> findAll(Class<T> domainType, Sort sort) {
public <T> List<T> findAll(Class<T> domainType, Sort sort) {
throw new UnsupportedOperationException();
}
@Override
public <T> Iterable<T> findAll(Class<T> domainType, Pageable pageable) {
public <T> List<T> findAll(Class<T> domainType, Pageable pageable) {
throw new UnsupportedOperationException();
}
@@ -81,12 +82,12 @@ class SingleQueryDataAccessStrategy implements ReadingDataAccessStrategy {
}
@Override
public <T> Iterable<T> findAll(Query query, Class<T> domainType) {
public <T> List<T> findAll(Query query, Class<T> domainType) {
return getReader(domainType).findAll(query);
}
@Override
public <T> Iterable<T> findAll(Query query, Class<T> domainType, Pageable pageable) {
public <T> List<T> findAll(Query query, Class<T> domainType, Pageable pageable) {
throw new UnsupportedOperationException();
}

18
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java
View File

@@ -23,8 +23,16 @@ import static org.springframework.data.jdbc.testing.TestConfiguration.*;
import static org.springframework.data.jdbc.testing.TestDatabaseFeatures.Feature.*;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.IntStream;
@@ -49,6 +57,7 @@ import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
import org.springframework.data.jdbc.core.convert.JdbcConverter;
import org.springframework.data.jdbc.testing.EnabledOnFeature;
import org.springframework.data.jdbc.testing.IntegrationTest;
import org.springframework.data.jdbc.testing.TestClass;
import org.springframework.data.jdbc.testing.TestConfiguration;
import org.springframework.data.jdbc.testing.TestDatabaseFeatures;
import org.springframework.data.mapping.context.InvalidPersistentPropertyPath;
@@ -63,6 +72,7 @@ import org.springframework.data.relational.core.query.CriteriaDefinition;
import org.springframework.data.relational.core.query.Query;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
/**
* Integration tests for {@link JdbcAggregateTemplate}.
@@ -1927,8 +1937,8 @@ abstract class AbstractJdbcAggregateTemplateIntegrationTests {
static class Config {
@Bean
Class<?> testClass() {
return JdbcAggregateTemplateIntegrationTests.class;
TestClass testClass() {
return TestClass.of(JdbcAggregateTemplateIntegrationTests.class);
}
@Bean
@@ -1938,9 +1948,11 @@ abstract class AbstractJdbcAggregateTemplateIntegrationTests {
}
}
@ContextConfiguration(classes = Config.class)
static class JdbcAggregateTemplateIntegrationTests extends AbstractJdbcAggregateTemplateIntegrationTests {}
@ActiveProfiles(value = PROFILE_SINGLE_QUERY_LOADING)
@ContextConfiguration(classes = Config.class)
static class JdbcAggregateTemplateSingleQueryLoadingIntegrationTests
extends AbstractJdbcAggregateTemplateIntegrationTests {