RowMappers and ResultSetExtractors.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/JdbcCodeBlocks.java

@@ -578,11 +578,11 @@ public CodeBlock build() {
 
 				if (rowMapperClass != null) {
 					builder.addStatement("$T $L = new $T()", RowMapper.class, rowMapper,
-							context.fieldNameOf(RowMapperFactory.class), rowMapperClass);
+							rowMapperClass);
 				} else if (StringUtils.hasText(rowMapperRef)) {
 					builder.addStatement("$T $L = $L.getRowMapper($S)", RowMapper.class, rowMapper,
 							context.fieldNameOf(RowMapperFactory.class), rowMapperRef);
-				} else {
+				} else if (resultSetExtractorClass == null) {
 					builder.addStatement("$T $L = $L.create($T.class)", RowMapper.class, rowMapper,
 							context.fieldNameOf(RowMapperFactory.class), actualReturnType);
 				}
@@ -593,7 +593,7 @@ public CodeBlock build() {
 
 					if (resultSetExtractorClass != null && (rowMapperClass != null || StringUtils.hasText(rowMapperRef))) {
 						builder.addStatement("$T $L = new $T($L)", ResultSetExtractor.class, resultSetExtractor,
-								resultSetExtractorClass, rowMapperRef);
+								resultSetExtractorClass, rowMapper);
 					} else if (resultSetExtractorClass != null) {
 						builder.addStatement("$T $L = new $T()", ResultSetExtractor.class, resultSetExtractor,
 								resultSetExtractorClass);

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

@@ -71,6 +71,16 @@ TestClass testClass() {
 			return TestClass.of(JdbcRepositoryContributorIntegrationTests.class);
 		}
 
+		@Bean
+		MyRowMapper myRowMapper() {
+			return new MyRowMapper();
+		}
+
+		@Bean
+		SimpleResultSetExtractor simpleResultSetExtractor() {
+			return new SimpleResultSetExtractor();
+		}
+
 	}
 
 	@BeforeEach
@@ -228,6 +238,40 @@ void shouldFindAnnotatedByFirstnameExpression() {
 		assertThat(walter.getFirstname()).isEqualTo("Walter");
 	}
 
+	@Test // GH-2121
+	void shouldFindUsingRowMapper() {
+
+		User walter = fragment.findUsingRowMapper("Walter");
+
+		assertThat(walter).isNotNull();
+		assertThat(walter.getFirstname()).isEqualTo("Row: 0");
+	}
+
+	@Test // GH-2121
+	void shouldFindUsingRowMapperRef() {
+
+		User walter = fragment.findUsingRowMapperRef("Walter");
+
+		assertThat(walter).isNotNull();
+		assertThat(walter.getFirstname()).isEqualTo("Row: 0");
+	}
+
+	@Test // GH-2121
+	void shouldFindUsingResultSetExtractor() {
+
+		int result = fragment.findUsingAndResultSetExtractor("Walter");
+
+		assertThat(result).isOne();
+	}
+
+	@Test // GH-2121
+	void shouldFindUsingResultSetExtractorRef() {
+
+		int result = fragment.findUsingAndResultSetExtractorRef("Walter");
+
+		assertThat(result).isOne();
+	}
+
 	@Test // GH-2121
 	void shouldDeleteByName() {
 

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.repository.aot;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.jdbc.core.RowMapper;
+
+/**
+ * @author Mark Paluch
+ */
+public class MyResultSetExtractor implements ResultSetExtractor<User> {
+
+	private final RowMapper<User> rowMapper;
+
+	public MyResultSetExtractor(RowMapper<User> rowMapper) {
+		this.rowMapper = rowMapper;
+	}
+
+	@Override
+	public User extractData(ResultSet rs) throws SQLException, DataAccessException {
+		return rs.next() ? rowMapper.mapRow(rs, 0) : null;
+	}
+}

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.repository.aot;
+
+import java.sql.ResultSet;
+
+import org.springframework.jdbc.core.RowMapper;
+
+/**
+ * @author Mark Paluch
+ */
+public class MyRowMapper implements RowMapper<User> {
+
+	@Override
+	public User mapRow(ResultSet rs, int rowNum) {
+		return new User("Row: " + rowNum, rowNum);
+	}
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.repository.aot;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ResultSetExtractor;
+
+/**
+ * @author Mark Paluch
+ */
+public class SimpleResultSetExtractor implements ResultSetExtractor<Integer> {
+
+	@Override
+	public Integer extractData(ResultSet rs) throws SQLException, DataAccessException {
+		return rs.next() ? 1 : 0;
+	}
+}

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

@@ -69,6 +69,23 @@ public interface UserRepository extends CrudRepository<User, Integer> {
 	@Query("SELECT * FROM MY_USER WHERE firstname = :#{#name}")
 	User findByFirstnameExpression(String name);
 
+	@Query(value = "SELECT * FROM MY_USER WHERE firstname = :name", rowMapperClass = MyRowMapper.class)
+	User findUsingRowMapper(String name);
+
+	@Query(value = "SELECT * FROM MY_USER WHERE firstname = :name", rowMapperClass = MyRowMapper.class,
+			resultSetExtractorClass = MyResultSetExtractor.class)
+	User findUsingRowMapperAndResultSetExtractor(String name);
+
+	@Query(value = "SELECT * FROM MY_USER WHERE firstname = :name", rowMapperRef = "myRowMapper")
+	User findUsingRowMapperRef(String name);
+
+	@Query(value = "SELECT * FROM MY_USER WHERE firstname = :name",
+			resultSetExtractorClass = SimpleResultSetExtractor.class)
+	int findUsingAndResultSetExtractor(String name);
+
+	@Query(value = "SELECT * FROM MY_USER WHERE firstname = :name", resultSetExtractorRef = "simpleResultSetExtractor")
+	int findUsingAndResultSetExtractorRef(String name);
+
 	// -------------------------------------------------------------------------
 	// Parameter naming
 	// -------------------------------------------------------------------------