Use field accessors for updated JavaPoet version.

Closes spring-projects#3342

Author: mp911de

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

@@ -45,12 +45,19 @@ public AotRepositoryFragmentMetadata(ClassName className) {
 		this.className = className;
 	}
 
+	/**
+	 * Lookup a field name by exact type. Returns the first field that matches the type or {@literal null} if no field
+	 * with that type was found.
+	 *
+	 * @param type
+	 * @return
+	 */
 	@Nullable
 	public String fieldNameOf(Class<?> type) {
 
 		TypeName lookup = TypeName.get(type).withoutAnnotations();
 		for (Entry<String, FieldSpec> field : fields.entrySet()) {
-			if (field.getValue().type.withoutAnnotations().equals(lookup)) {
+			if (field.getValue().type().withoutAnnotations().equals(lookup)) {
 				return field.getKey();
 			}
 		}
@@ -62,29 +69,76 @@ public ClassName getTargetTypeName() {
 		return className;
 	}
 
+	/**
+	 * Add a field to the repository fragment.
+	 *
+	 * @param fieldName name of the field to add. Must be unique.
+	 * @param type field type.
+	 * @param modifiers modifiers for the field, e.g. {@link Modifier#PRIVATE}, {@link Modifier#FINAL}, etc.
+	 */
 	public void addField(String fieldName, TypeName type, Modifier... modifiers) {
 		fields.put(fieldName, FieldSpec.builder(type, fieldName, modifiers).build());
 	}
 
+	/**
+	 * Add a field to the repository fragment.
+	 *
+	 * @param fieldSpec the field specification to add.
+	 */
 	public void addField(FieldSpec fieldSpec) {
-		fields.put(fieldSpec.name, fieldSpec);
+		fields.put(fieldSpec.name(), fieldSpec);
 	}
 
+	/**
+	 * Returns the fields of the repository fragment.
+	 *
+	 * @return the fields of the repository fragment.
+	 */
 	public Map<String, FieldSpec> getFields() {
 		return fields;
 	}
 
-	public Map<String, ConstructorArgument> getConstructorArguments() {
-		return constructorArguments;
-	}
-
+	/**
+	 * Add a constructor argument to the repository fragment.
+	 *
+	 * @param parameterName name of the constructor parameter to add. Must be unique.
+	 * @param type type of the constructor parameter.
+	 * @param fieldName name of the field to bind the constructor parameter to, or {@literal null} if no field should be
+	 *          created.
+	 */
 	public void addConstructorArgument(String parameterName, TypeName type, @Nullable String fieldName) {
+
 		this.constructorArguments.put(parameterName, new ConstructorArgument(parameterName, type, fieldName));
+
+		if (fieldName != null) {
+			addField(parameterName, type, Modifier.PRIVATE, Modifier.FINAL);
+		}
 	}
 
+	/**
+	 * Returns the constructor arguments of the repository fragment.
+	 *
+	 * @return the constructor arguments of the repository fragment.
+	 */
+	public Map<String, ConstructorArgument> getConstructorArguments() {
+		return constructorArguments;
+	}
+
+	/**
+	 * Constructor argument metadata.
+	 *
+	 * @param parameterName
+	 * @param typeName
+	 * @param fieldName
+	 */
 	public record ConstructorArgument(String parameterName, TypeName typeName, @Nullable String fieldName) {
 
+		@Deprecated(forRemoval = true)
 		boolean isForLocalField() {
+			return isBoundToField();
+		}
+
+		boolean isBoundToField() {
 			return fieldName != null;
 		}
 

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

@@ -94,7 +94,7 @@ public MethodSpec buildMethod() {
 
 		builder.addJavadoc("AOT generated implementation of {@link $T#$L($L)}.", context.getMethod().getDeclaringClass(),
 				context.getMethod().getName(), StringUtils.collectionToCommaDelimitedString(context.getTargetMethodMetadata()
-						.getMethodArguments().values().stream().map(it -> it.type.toString()).collect(Collectors.toList())));
+						.getMethodArguments().values().stream().map(it -> it.type().toString()).collect(Collectors.toList())));
 		context.getTargetMethodMetadata().getMethodArguments().forEach((name, spec) -> builder.addParameter(spec));
 		builder.addCode(methodBody);
 		customizer.accept(context, builder);

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

@@ -80,7 +80,7 @@ ResolvableType getActualReturnType() {
 	}
 
 	void addParameter(ParameterSpec parameterSpec) {
-		this.methodArguments.put(parameterSpec.name, parameterSpec);
+		this.methodArguments.put(parameterSpec.name(), parameterSpec);
 	}
 
 	Map<String, ParameterSpec> getMethodArguments() {

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

@@ -83,10 +83,6 @@ public void addParameter(String parameterName, TypeName type) {
 	public void addParameter(String parameterName, TypeName type, boolean createField) {
 
 		this.metadata.addConstructorArgument(parameterName, type, createField ? parameterName : null);
-
-		if (createField) {
-			this.metadata.addField(parameterName, type, Modifier.PRIVATE, Modifier.FINAL);
-		}
 	}
 
 	/**
@@ -113,7 +109,7 @@ public MethodSpec buildConstructor() {
 		customizer.customize(builder);
 
 		for (Entry<String, ConstructorArgument> parameter : this.metadata.getConstructorArguments().entrySet()) {
-			if (parameter.getValue().isForLocalField()) {
+			if (parameter.getValue().isBoundToField()) {
 				builder.addStatement("this.$N = $N", parameter.getKey(), parameter.getKey());
 			}
 		}

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

@@ -31,8 +31,6 @@
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.javapoet.JavaFile;
 import org.springframework.javapoet.TypeName;
-import org.springframework.util.StringUtils;
-import org.springframework.javapoet.TypeSpec;
 
 /**
  * Contributor for AOT repository fragments.
@@ -98,7 +96,7 @@ public void contribute(GenerationContext generationContext) {
 		String repositoryJsonFileName = getRepositoryJsonFileName(repositoryInterface);
 
 		JavaFile javaFile = aotBundle.javaFile();
-		String typeName = "%s.%s".formatted(javaFile.packageName, javaFile.typeSpec.name);
+		String typeName = "%s.%s".formatted(javaFile.packageName(), javaFile.typeSpec().name());
 		String repositoryJson;
 
 		try {

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

@@ -78,7 +78,7 @@ void appliesCtorArguments() {
 		repoBuilder.withConstructorCustomizer(ctor -> {
 			ctor.addParameter("param1", Metric.class);
 			ctor.addParameter("param2", String.class);
-			ctor.addParameter("ctorScoped", TypeName.OBJECT, false);
+			ctor.addParameter("ctorScoped", TypeName.get(Object.class), false);
 		});
 		assertThat(repoBuilder.build().javaFile().toString()) //
 				.contains("private final Metric param1;") //