Review findings.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java

@@ -775,13 +775,10 @@ public T mapRow(ResultSet resultSet, int rowNumber) throws SQLException {
 
 			T object = super.mapRow(resultSet, rowNumber);
 
-			if (object != null) {
+			eventDelegate.publishEvent(() -> new AfterConvertEvent<>(object));
 
-				eventDelegate.publishEvent(() -> new AfterConvertEvent<>(object));
-
-				if (entityCallbacks != null) {
-					return entityCallbacks.callback(AfterConvertCallback.class, object);
-				}
+			if (entityCallbacks != null) {
+				return entityCallbacks.callback(AfterConvertCallback.class, object);
 			}
 
 			return object;

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

@@ -47,6 +47,7 @@
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.data.util.Pair;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
 import org.springframework.javapoet.TypeName;
@@ -591,8 +592,7 @@ public CodeBlock build() {
 				String resultSetExtractor = null;
 
 				if (rowMapperClass != null) {
-					builder.addStatement("$T $L = new $T()", RowMapper.class, rowMapper,
-							rowMapperClass);
+					builder.addStatement("$T $L = new $T()", RowMapper.class, rowMapper, rowMapperClass);
 				} else if (StringUtils.hasText(rowMapperRef)) {
 					builder.addStatement("$T $L = getRowMapperFactory().getRowMapper($S)", RowMapper.class, rowMapper,
 							rowMapperRef);
@@ -697,24 +697,23 @@ private CodeBlock update(Builder builder, Class<?> returnType) {
 
 			String result = context.localVariable("result");
 
-			if (returnType == Void.TYPE || returnType == Void.class) {
-
-				builder.addStatement("getJdbcOperations().update($L, $L)", queryVariableName, parameterSourceVariableName);
-
-				if (returnType == Void.class) {
-					builder.addStatement("return null");
-				}
+			builder.add("$[");
 
-				return builder.build();
+			if (!ReflectionUtils.isVoid(returnType)) {
+				builder.add("int $L = ", result);
 			}
 
-			builder.addStatement("int $L = getJdbcOperations().update($L, $L)", result, queryVariableName,
-					parameterSourceVariableName);
+			builder.add("getJdbcOperations().update($L, $L)", queryVariableName, parameterSourceVariableName);
+			builder.add(";\n$]");
 
 			if (returnType == boolean.class || returnType == Boolean.class) {
 				builder.addStatement("return $L != 0", result);
 			} else if (returnType == Long.class) {
 				builder.addStatement("return (long) $L", result);
+			} else if (ReflectionUtils.isVoid(returnType)) {
+				if (returnType == Void.class) {
+					builder.addStatement("return null");
+				}
 			} else {
 				builder.addStatement("return $L", result);
 			}
@@ -728,8 +727,8 @@ private CodeBlock delete(Builder builder, String rowMapper, String result, TypeN
 			builder.addStatement("$T $L = getRowMapperFactory().create($T.class)", RowMapper.class, rowMapper,
 					context.getRepositoryInformation().getDomainType());
 
-			builder.addStatement("$T $L = ($T) getJdbcOperations().query($L, $L, new $T<>($L))", List.class, result,
-					List.class, queryVariableName, parameterSourceVariableName, RowMapperResultSetExtractor.class, rowMapper);
+			builder.addStatement("$1T $2L = ($1T) getJdbcOperations().query($3L, $4L, new $5T<>($6L))", List.class, result,
+					queryVariableName, parameterSourceVariableName, RowMapperResultSetExtractor.class, rowMapper);
 
 			builder.addStatement("$L.forEach(getOperations()::delete)", result);
 
@@ -742,6 +741,10 @@ private CodeBlock delete(Builder builder, String rowMapper, String result, TypeN
 				builder.addStatement("return !$L.isEmpty()", result);
 			} else if (returnType == Long.class) {
 				builder.addStatement("return (long) $L.size()", result);
+			} else if (ReflectionUtils.isVoid(returnType)) {
+				if (returnType == Void.class) {
+					builder.addStatement("return null");
+				}
 			} else {
 				builder.addStatement("return $L.size()", result);
 			}

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

@@ -16,14 +16,18 @@
 package org.springframework.data.jdbc.repository.aot;
 
 import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.aot.AotTypeConfiguration;
 import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.data.repository.config.AotRepositoryContext;
@@ -123,6 +127,21 @@ public Set<Class<?>> getResolvedTypes() {
 		return Set.of(User.class);
 	}
 
+	@Override
+	public Set<Class<?>> getUserDomainTypes() {
+		return Set.of();
+	}
+
+	@Override
+	public void typeConfiguration(Class<?> type, Consumer<AotTypeConfiguration> configurationConsumer) {
+
+	}
+
+	@Override
+	public Collection<AotTypeConfiguration> typeConfigurations() {
+		return List.of();
+	}
+
 	public void setBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}