Use plain string instead of wrapper

Author: christophstrobl

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

@@ -28,7 +28,6 @@
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotationSelectors;
 import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.data.repository.aot.generate.VariableNameFactory.VariableName;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.QueryMethod;
@@ -135,7 +134,7 @@ public TypeName getReturnTypeName() {
 	 * @param variableName the intended variable name.
 	 * @return the suggested VariableName
 	 */
-	public VariableName suggestLocalVariableName(String variableName) {
+	public String suggestLocalVariableName(String variableName) {
 		return variableNameFactory.generateName(variableName);
 	}
 

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

@@ -29,7 +29,7 @@
  */
 class LocalVariableNameFactory implements VariableNameFactory {
 
-	private final MultiValueMap<String, VariableName> variables;
+	private final MultiValueMap<String, String> variables;
 
 	static LocalVariableNameFactory forMethod(MethodMetadata methodMetadata) {
 		return of(methodMetadata.getMethodArguments().keySet());
@@ -47,24 +47,22 @@ static LocalVariableNameFactory of(Set<String> variables) {
 
 		variables = new LinkedMultiValueMap<>();
 		for (String parameterName : predefinedVariableNames) {
-			variables.add(parameterName, new VariableName(parameterName));
+			variables.add(parameterName, parameterName);
 		}
 	}
 
 	@Override
-	public VariableName generateName(String suggestedName) {
+	public String generateName(String suggestedName) {
 
 		if (!variables.containsKey(suggestedName)) {
-			VariableName variableName = new VariableName(suggestedName);
-			variables.add(suggestedName, variableName);
-			return variableName;
+			variables.add(suggestedName, suggestedName);
+			return suggestedName;
 		}
 
 		String targetName = suggestTargetName(suggestedName);
-		VariableName variableName = new VariableName(suggestedName, targetName);
-		variables.add(suggestedName, variableName);
-		variables.add(targetName, variableName);
-		return variableName;
+		variables.add(suggestedName, targetName);
+		variables.add(targetName, targetName);
+		return targetName;
 	}
 
 	String suggestTargetName(String suggested) {

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

@@ -21,16 +21,6 @@
  */
 public interface VariableNameFactory {
 
-	VariableName generateName(String suggestedName);
+	String generateName(String suggestedName);
 
-	record VariableName(String source, String target) {
-
-		public VariableName(String source) {
-			this(source, source);
-		}
-
-		public String name() {
-			return target;
-		}
-	}
 }

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

@@ -37,26 +37,26 @@ void beforeEach() {
 	@Test // GH-3270
 	void resolvesNameClashesInNames() {
 
-		assertThat(variableNameFactory.generateName("name").name()).isEqualTo("name");
-		assertThat(variableNameFactory.generateName("name").name()).isEqualTo("name_1");
-		assertThat(variableNameFactory.generateName("name").name()).isEqualTo("name_2");
-		assertThat(variableNameFactory.generateName("name1").name()).isEqualTo("name1");
-		assertThat(variableNameFactory.generateName("name3").name()).isEqualTo("name3");
-		assertThat(variableNameFactory.generateName("name3").name()).isEqualTo("name3_1");
-		assertThat(variableNameFactory.generateName("name4_1").name()).isEqualTo("name4_1");
-		assertThat(variableNameFactory.generateName("name4").name()).isEqualTo("name4");
-		assertThat(variableNameFactory.generateName("name4_1_1").name()).isEqualTo("name4_1_1");
-		assertThat(variableNameFactory.generateName("name4_1").name()).isEqualTo("name4_1_2");
-		assertThat(variableNameFactory.generateName("name4_1").name()).isEqualTo("name4_1_3");
+		assertThat(variableNameFactory.generateName("name")).isEqualTo("name");
+		assertThat(variableNameFactory.generateName("name")).isEqualTo("name_1");
+		assertThat(variableNameFactory.generateName("name")).isEqualTo("name_2");
+		assertThat(variableNameFactory.generateName("name1")).isEqualTo("name1");
+		assertThat(variableNameFactory.generateName("name3")).isEqualTo("name3");
+		assertThat(variableNameFactory.generateName("name3")).isEqualTo("name3_1");
+		assertThat(variableNameFactory.generateName("name4_1")).isEqualTo("name4_1");
+		assertThat(variableNameFactory.generateName("name4")).isEqualTo("name4");
+		assertThat(variableNameFactory.generateName("name4_1_1")).isEqualTo("name4_1_1");
+		assertThat(variableNameFactory.generateName("name4_1")).isEqualTo("name4_1_2");
+		assertThat(variableNameFactory.generateName("name4_1")).isEqualTo("name4_1_3");
 	}
 
 	@Test // GH-3270
 	void considersPredefinedNames() {
-		assertThat(variableNameFactory.generateName("firstname").name()).isEqualTo("firstname_1");
+		assertThat(variableNameFactory.generateName("firstname")).isEqualTo("firstname_1");
 	}
 
 	@Test // GH-3270
 	void considersCase() {
-		assertThat(variableNameFactory.generateName("firstName").name()).isEqualTo("firstName");
+		assertThat(variableNameFactory.generateName("firstName")).isEqualTo("firstName");
 	}
 }