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

Original pull request: #256.

Author: schauder

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

@@ -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 //
 		);});
 	}

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

@@ -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;
@@ -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)
@@ -144,6 +159,11 @@ 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;
@@ -179,4 +199,13 @@ 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();
+	}
+
+
 }