Polishing.

Refine local variable handling to logical and physical naming where the logical name is used in AOT contributor code while the physical name is rendered.

Author: mp911de

src/main/java/org/springframework/data/repository/aot/generate/AotQueryMethodGenerationContext.java

@@ -128,13 +128,14 @@ public TypeName getReturnTypeName() {
 	}
 
 	/**
-	 * Suggest naming clash free variant for the given intended variable name within the local method context.
+	 * Obtain a naming-clash free variant for the given logical variable name within the local method context. Returns the
+	 * target variable name when called multiple times with the same {@code variableName}.
 	 *
-	 * @param variableName the intended variable name.
-	 * @return the suggested VariableName
+	 * @param variableName the logical variable name.
+	 * @return the variable name used in the generated code.
 	 */
-	public String suggestLocalVariableName(String variableName) {
-		return variableNameFactory.generateName(variableName);
+	public String localVariable(String variableName) {
+		return targetMethodMetadata.getLocalVariables().computeIfAbsent(variableName, variableNameFactory::generateName);
 	}
 
 	/**

src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBuilder.java

@@ -52,6 +52,8 @@
  */
 class AotRepositoryBuilder {
 
+	private static final Log logger = LogFactory.getLog(AotRepositoryBuilder.class);
+
 	private final RepositoryInformation repositoryInformation;
 	private final String moduleName;
 	private final ProjectionFactory projectionFactory;
@@ -146,7 +148,14 @@ public AotBundle build() {
 					return it.getDeclaringClass().getName();
 				}).thenComparing(Method::getName).thenComparing(Method::getParameterCount).thenComparing(Method::toString))
 				.forEach(method -> {
-					contributeMethod(method, repositoryComposition, methodMetadata, builder);
+					try {
+						contributeMethod(method, repositoryComposition, methodMetadata, builder);
+					} catch (RuntimeException e) {
+						if (logger.isErrorEnabled()) {
+							logger.error("Failed to contribute Repository method [%s.%s]"
+									.formatted(repositoryInformation.getRepositoryInterface().getName(), method.getName()), e);
+						}
+					}
 				});
 
 		// write fields at the end so we make sure to capture things added by methods

src/main/java/org/springframework/data/repository/aot/generate/LocalVariableNameFactory.java

@@ -31,10 +31,16 @@ class LocalVariableNameFactory implements VariableNameFactory {
 
 	private final MultiValueMap<String, String> variables;
 
+	LocalVariableNameFactory(Iterable<String> predefinedVariableNames) {
+
+		variables = new LinkedMultiValueMap<>();
+		predefinedVariableNames.forEach(varName -> variables.add(varName, varName));
+	}
+
 	/**
 	 * Create a new {@link LocalVariableNameFactory} considering available {@link MethodMetadata#getMethodArguments()
 	 * method arguments}.
-	 * 
+	 *
 	 * @param methodMetadata source metadata
 	 * @return new instance of {@link LocalVariableNameFactory}.
 	 */
@@ -52,12 +58,6 @@ static LocalVariableNameFactory of(Set<String> predefinedVariables) {
 		return new LocalVariableNameFactory(predefinedVariables);
 	}
 
-	LocalVariableNameFactory(Iterable<String> predefinedVariableNames) {
-
-		variables = new LinkedMultiValueMap<>();
-		predefinedVariableNames.forEach(varName -> variables.add(varName, varName));
-	}
-
 	@Override
 	public String generateName(String intendedVariableName) {
 
@@ -84,4 +84,5 @@ String suggestTargetName(String suggested, int counter) {
 		}
 		return suggestTargetName(suggested, counter + 1);
 	}
+
 }

src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java

@@ -35,11 +35,13 @@
  * Metadata about an AOT Repository method.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 4.0
  */
 class MethodMetadata {
 
 	private final Map<String, ParameterSpec> methodArguments = new LinkedHashMap<>();
+	private final Map<String, String> localVariables = new LinkedHashMap<>();
 	private final ResolvableType actualReturnType;
 	private final ResolvableType returnType;
 
@@ -90,6 +92,10 @@ String getParameterName(int position) {
 		return null;
 	}
 
+	Map<String, String> getLocalVariables() {
+		return localVariables;
+	}
+
 	private void initParameters(RepositoryInformation repositoryInformation, Method method,
 			ParameterNameDiscoverer nameDiscoverer) {
 

src/test/java/org/springframework/data/repository/aot/generate/AotQueryMethodGenerationContextUnitTests.java

@@ -15,13 +15,14 @@
  */
 package org.springframework.data.repository.aot.generate;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
 
 import java.lang.reflect.Method;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.query.QueryMethod;
@@ -31,6 +32,7 @@
  * Tests targeting {@link AotQueryMethodGenerationContext}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 class AotQueryMethodGenerationContextUnitTests {
 
@@ -39,8 +41,8 @@ void suggestLocalVariableNameConsidersMethodArguments() throws NoSuchMethodExcep
 
 		AotQueryMethodGenerationContext ctx = ctxFor("reservedParameterMethod");
 
-		assertThat(ctx.suggestLocalVariableName("foo")).isEqualTo("foo");
-		assertThat(ctx.suggestLocalVariableName("arg0")).isNotIn("arg0", "arg1", "arg2");
+		assertThat(ctx.localVariable("foo")).isEqualTo("foo");
+		assertThat(ctx.localVariable("arg0")).isNotIn("arg0", "arg1", "arg2");
 	}
 
 	AotQueryMethodGenerationContext ctxFor(String methodName) throws NoSuchMethodException {