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

DATAJDBC-172 - Support entity type, Optional and Stream as return type of @Query methods.

Browse Source 
Original pull request: #40.
This commit is contained in:
Kazuki Shimizu
2018-02-08 00:33:05 +09:00
committed by Jens Schauder
parent 9a90d7e09b
commit 6f6499026a
2 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.data.jdbc.repository.support;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
import org.springframework.data.repository.query.RepositoryQuery;
import org.springframework.jdbc.core.RowMapper;
@@ -53,7 +54,15 @@ class JdbcRepositoryQuery implements RepositoryQuery {
parameters.addValue(parameterName, objects[p.getIndex()]);
});
return context.getTemplate().query(query, parameters, rowMapper);
if (queryMethod.isCollectionQuery() || queryMethod.isStreamQuery()) {
return context.getTemplate().query(query, parameters, rowMapper);
} else {
try {
return context.getTemplate().queryForObject(query, parameters, rowMapper);
} catch (EmptyResultDataAccessException e) {
return null;
}
}
}
@Override

64
src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java
View File

@@ -18,6 +18,8 @@ package org.springframework.data.jdbc.repository.query;
import static org.assertj.core.api.Assertions.*;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -80,6 +82,57 @@ public class QueryAnnotationHsqlIntegrationTests {
}
@Test // DATAJDBC-172
public void executeCustomQueryWithReturnTypeIsOptional() {
DummyEntity dummyEntity = dummyEntity("a");
repository.save(dummyEntity);
Optional<DummyEntity> entity = repository.findByIdWithReturnTypeIsOptional(dummyEntity.id);
assertThat(entity).map(e -> e.name).contains("a");
}
@Test // DATAJDBC-172
public void executeCustomQueryWithReturnTypeIsOptionalWhenEntityNotFound() {
DummyEntity dummyEntity = dummyEntity("a");
repository.save(dummyEntity);
Optional<DummyEntity> entity = repository.findByIdWithReturnTypeIsOptional(9999L);
assertThat(entity).isNotPresent();
}
@Test // DATAJDBC-172
public void executeCustomQueryWithReturnTypeIsEntity() {
DummyEntity dummyEntity = dummyEntity("a");
repository.save(dummyEntity);
DummyEntity entity = repository.findByIdWithReturnTypeIsEntity(dummyEntity.id);
assertThat(entity).isNotNull();
assertThat(entity.name).isEqualTo("a");
}
@Test // DATAJDBC-172
public void executeCustomQueryWithReturnTypeIsStream() {
repository.save(dummyEntity("a"));
repository.save(dummyEntity("b"));
Stream<DummyEntity> entities = repository.findAllWithReturnTypeIsStream();
assertThat(entities) //
.extracting(e -> e.name) //
.containsExactlyInAnyOrder("a", "b");
}
private DummyEntity dummyEntity(String name) {
DummyEntity entity = new DummyEntity();
@@ -110,8 +163,17 @@ public class QueryAnnotationHsqlIntegrationTests {
@Query("SELECT * FROM DUMMYENTITY WHERE lower(name) <> name")
List<DummyEntity> findByNameContainingCapitalLetter();
@Query("SELECT * FROM DUMMYENTITY WHERE name < :upper and name > :lower")
List<DummyEntity> findByNamedRangeWithNamedParameter(@Param("lower") String lower, @Param("upper") String upper);
@Query("SELECT * FROM DUMMYENTITY WHERE id = :id FOR UPDATE")
Optional<DummyEntity> findByIdWithReturnTypeIsOptional(@Param("id") Long id);
@Query("SELECT * FROM DUMMYENTITY WHERE id = :id FOR UPDATE")
DummyEntity findByIdWithReturnTypeIsEntity(@Param("id") Long id);
@Query("SELECT * FROM DUMMYENTITY")
Stream<DummyEntity> findAllWithReturnTypeIsStream();
}
}