Skip to content

DATAJDBC-620 - The default RowMapper now gets passed to ResultSetConstructor. #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

DATAJDBC-620 - The default RowMapper now gets passed to ResultSetConstructor. #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46b40bd
DATAJDBC-620 - Prepare branch
schauder Dec 14, 2020
ef08bc5
DATAJDBC-620 - The default RowMapper now gets passed to ResultSetCons…
schauder Dec 14, 2020
141210a
DATAJDBC-620 - Polishing.
schauder Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data Relational Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-jdbc-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions spring-data-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-jdbc</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>

<name>Spring Data JDBC</name>
<description>Spring Data module for JDBC repositories.</description>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ...bc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOpera
RowMapper<Object> rowMapper = determineRowMapper(defaultRowMapper);
return getQueryExecution( //
queryMethod, //
determineResultSetExtractor(rowMapper != defaultRowMapper ? rowMapper : null), //
determineResultSetExtractor(rowMapper), //
rowMapper //
);});
}
Expand Down
33 changes: 30 additions & 3 deletions ...mework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.springframework.context.annotation.Import;
import org.springframework.dao.DataAccessException;
import org.springframework.data.annotation.Id;
import org.springframework.data.jdbc.core.convert.EntityRowMapper;
import org.springframework.data.jdbc.repository.config.DefaultQueryMappingConfiguration;
import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
import org.springframework.data.jdbc.repository.query.Query;
Expand Down Expand Up @@ -134,6 +135,20 @@ public List<Car> extractData(ResultSet rs) throws SQLException, DataAccessExcept
}
}

public static class RowMapperResultSetExtractor implements ResultSetExtractor<RowMapper> {

final RowMapper rowMapper;

public RowMapperResultSetExtractor(RowMapper rowMapper) {
this.rowMapper = rowMapper;
}

@Override
public RowMapper extractData(ResultSet rs) throws SQLException, DataAccessException {
return rowMapper;
}
}

interface CarRepository extends CrudRepository<Car, Long> {

@Query(value = "select * from car", resultSetExtractorClass = CarResultSetExtractor.class)
Expand All @@ -144,13 +159,18 @@ interface CarRepository extends CrudRepository<Car, Long> {

@Query(value = "select model from car", rowMapperRef = "CustomRowMapperBean")
List<String> findByNameWithRowMapperBean();


@Query(value = "select * from car", resultSetExtractorClass = RowMapperResultSetExtractor.class)
RowMapper customFindAllWithRowMapper();

}

@Autowired NamedParameterJdbcTemplate template;
@Autowired CarRepository carRepository;

@Test // DATAJDBC-290
public void customFindAllCarsUsesConfiguredResultSetExtractor() {
void customFindAllCarsUsesConfiguredResultSetExtractor() {

carRepository.save(new Car(null, "Some model"));
Iterable<Car> cars = carRepository.customFindAll();
Expand All @@ -160,7 +180,7 @@ public void customFindAllCarsUsesConfiguredResultSetExtractor() {
}

@Test // DATAJDBC-430
public void customFindWithRowMapperBeanSupportingInjection() {
void customFindWithRowMapperBeanSupportingInjection() {

carRepository.save(new Car(null, "Some model"));
List<String> names = carRepository.findByNameWithRowMapperBean();
Expand All @@ -170,7 +190,7 @@ public void customFindWithRowMapperBeanSupportingInjection() {
}

@Test // DATAJDBC-430
public void customFindWithResultSetExtractorBeanSupportingInjection() {
void customFindWithResultSetExtractorBeanSupportingInjection() {

carRepository.save(new Car(null, "Some model"));
Iterable<Car> cars = carRepository.findByNameWithResultSetExtractor();
Expand All @@ -179,4 +199,11 @@ public void customFindWithResultSetExtractorBeanSupportingInjection() {
assertThat(cars).allMatch(car -> VALUE_PROCESSED_BY_SERVICE.equals(car.getModel()));
}

@Test // DATAJDBC-620
void defaultRowMapperGetsInjectedIntoCustomResultSetExtractor() {

RowMapper rowMapper = carRepository.customFindAllWithRowMapper();

assertThat(rowMapper).isNotNull();
}
}
4 changes: 2 additions & 2 deletions spring-data-relational/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-relational</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>

<name>Spring Data Relational</name>
<description>Spring Data Relational support</description>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>2.2.0-DATAJDBC-620-SNAPSHOT</version>
</parent>

<properties>
Expand Down