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

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

Browse Source 
Original pull request: #256.
This commit is contained in:
Jens Schauder
2020-12-14 16:16:34 +01:00
committed by Mark Paluch
parent 12ccf5bf5b
commit 3d4847a552
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java
View File

@@ -77,7 +77,7 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery {
RowMapper<Object> rowMapper = determineRowMapper(defaultRowMapper);
return getQueryExecution( //
queryMethod, //
determineResultSetExtractor(rowMapper != defaultRowMapper ? rowMapper : null), //
determineResultSetExtractor(rowMapper), //
rowMapper //
);});
}

29
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java
View File

@@ -34,6 +34,7 @@ import org.springframework.context.annotation.Configuration;
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;
@@ -134,6 +135,20 @@ public class StringBasedJdbcQueryMappingConfigurationIntegrationTests {
}
}
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)
@@ -144,6 +159,11 @@ public class StringBasedJdbcQueryMappingConfigurationIntegrationTests {
@Query(value = "select model from car", rowMapperRef = "CustomRowMapperBean")
List<String> findByNameWithRowMapperBean();
@Query(value = "select * from car", resultSetExtractorClass = RowMapperResultSetExtractor.class)
RowMapper customFindAllWithRowMapper();
}
@Autowired NamedParameterJdbcTemplate template;
@@ -179,4 +199,13 @@ public class StringBasedJdbcQueryMappingConfigurationIntegrationTests {
assertThat(cars).allMatch(car -> VALUE_PROCESSED_BY_SERVICE.equals(car.getModel()));
}
@Test // DATAJDBC-620
void defaultRowMapperGetsInjectedIntoCustomResultSetExtractor() {
RowMapper rowMapper = carRepository.customFindAllWithRowMapper();
assertThat(rowMapper).isNotNull();
}
}