From b51c77b50aef87469f1de5497611bb8c0dd36492 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 16 Jan 2025 10:45:27 +0100 Subject: [PATCH] Polishing. Minor formatting and references to GH issues. See #1714 Original pull request #1963 --- .../data/jdbc/core/JdbcAggregateTemplate.java | 1 + .../data/jdbc/mybatis/MyBatisDataAccessStrategy.java | 3 +++ .../core/AbstractJdbcAggregateTemplateIntegrationTests.java | 1 + .../jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java | 6 +++--- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java index 0253efbf9..58c1bfc25 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java @@ -344,6 +344,7 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { @Override public Stream streamAll(Class domainType) { + Iterable items = triggerAfterConvert(accessStrategy.findAll(domainType)); return StreamSupport.stream(items.spliterator(), false).map(this::triggerAfterConvert); } diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java index 7bc76841a..beb6cbf6c 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java @@ -269,6 +269,7 @@ public class MyBatisDataAccessStrategy implements DataAccessStrategy { @Override public Stream streamAll(Class domainType) { + String statement = namespace(domainType) + ".streamAll"; MyBatisContext parameter = new MyBatisContext(null, null, domainType, Collections.emptyMap()); Cursor cursor = sqlSession().selectCursor(statement, parameter); @@ -277,12 +278,14 @@ public class MyBatisDataAccessStrategy implements DataAccessStrategy { @Override public List findAllById(Iterable ids, Class domainType) { + return sqlSession().selectList(namespace(domainType) + ".findAllById", new MyBatisContext(ids, null, domainType, Collections.emptyMap())); } @Override public Stream streamAllByIds(Iterable ids, Class domainType) { + String statement = namespace(domainType) + ".streamAllByIds"; MyBatisContext parameter = new MyBatisContext(ids, null, domainType, Collections.emptyMap()); Cursor cursor = sqlSession().selectCursor(statement, parameter); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java index 5b970c20c..4f047f840 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AbstractJdbcAggregateTemplateIntegrationTests.java @@ -389,6 +389,7 @@ abstract class AbstractJdbcAggregateTemplateIntegrationTests { @Test // GH-1714 void findByNonPropertySortLikeStreamFails() { + assertThatThrownBy(() -> template.streamAll(LegoSet.class, Sort.by("somethingNotExistant"))) .isInstanceOf(InvalidPersistentPropertyPath.class); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java index dab8a764c..4f66d3d81 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java @@ -247,7 +247,7 @@ public class MyBatisDataAccessStrategyUnitTests { ); } - @Test + @Test // GH-1714 public void streamAll() { String value = "some answer"; @@ -299,7 +299,7 @@ public class MyBatisDataAccessStrategyUnitTests { ); } - @Test + @Test // GH-1714 public void streamAllByIds() { String value = "some answer 2"; @@ -430,7 +430,7 @@ public class MyBatisDataAccessStrategyUnitTests { ); } - @Test + @Test // GH-1714 public void streamAllSorted() { String value = "some answer 3";