Reduce API surface, expose interfaces only.

Author: mp911de

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

@@ -22,14 +22,15 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import javax.lang.model.element.Modifier;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.aot.generate.ClassNameGenerator;
 import org.springframework.aot.generate.Generated;
 import org.springframework.data.projection.ProjectionFactory;
@@ -43,6 +44,7 @@
 import org.springframework.javapoet.JavaFile;
 import org.springframework.javapoet.TypeName;
 import org.springframework.javapoet.TypeSpec;
+import org.springframework.util.Assert;
 
 /**
  * Builder for AOT repository fragments.
@@ -59,8 +61,8 @@ class AotRepositoryBuilder {
 	private final AotRepositoryFragmentMetadata generationMetadata;
 
 	private @Nullable Consumer<AotRepositoryConstructorBuilder> constructorCustomizer;
-	private @Nullable BiFunction<Method, RepositoryInformation, @Nullable MethodContributor<? extends QueryMethod>> methodContributorFunction;
-	private ClassCustomizer customizer;
+	private @Nullable Function<Method, @Nullable MethodContributor<? extends QueryMethod>> methodContributorFunction;
+	private Consumer<AotRepositoryClassBuilder> classCustomizer;
 
 	private AotRepositoryBuilder(RepositoryInformation repositoryInformation, ProjectionFactory projectionFactory) {
 
@@ -73,7 +75,7 @@ private AotRepositoryBuilder(RepositoryInformation repositoryInformation, Projec
 				.initializer("$T.getLog($T.class)", TypeName.get(LogFactory.class), this.generationMetadata.getTargetTypeName())
 				.build());
 
-		this.customizer = (info, builder) -> {};
+		this.classCustomizer = (builder) -> {};
 	}
 
 	public static <M extends QueryMethod> AotRepositoryBuilder forRepository(RepositoryInformation repositoryInformation,
@@ -89,14 +91,14 @@ public AotRepositoryBuilder withConstructorCustomizer(
 	}
 
 	public AotRepositoryBuilder withQueryMethodContributor(
-			BiFunction<Method, RepositoryInformation, @Nullable MethodContributor<? extends QueryMethod>> methodContributorFunction) {
+			Function<Method, @Nullable MethodContributor<? extends QueryMethod>> methodContributorFunction) {
 		this.methodContributorFunction = methodContributorFunction;
 		return this;
 	}
 
-	public AotRepositoryBuilder withClassCustomizer(ClassCustomizer classCustomizer) {
+	public AotRepositoryBuilder withClassCustomizer(Consumer<AotRepositoryClassBuilder> classCustomizer) {
 
-		this.customizer = classCustomizer;
+		this.classCustomizer = classCustomizer;
 		return this;
 	}
 
@@ -110,7 +112,7 @@ public AotBundle build() {
 						repositoryInformation.getRepositoryInterface());
 
 		// create the constructor
-		AotRepositoryConstructorBuilder constructorBuilder = new AotRepositoryConstructorBuilder(repositoryInformation,
+		RepositoryConstructorBuilder constructorBuilder = new RepositoryConstructorBuilder(
 				generationMetadata);
 		if (constructorCustomizer != null) {
 			constructorCustomizer.accept(constructorBuilder);
@@ -144,7 +146,12 @@ public AotBundle build() {
 		generationMetadata.getFields().values().forEach(builder::addField);
 
 		// finally customize the file itself
-		this.customizer.customize(repositoryInformation, builder);
+		this.classCustomizer.accept(customizer -> {
+
+			Assert.notNull(customizer, "ClassCustomizer must not be null");
+			customizer.customize(builder);
+		});
+
 		JavaFile javaFile = JavaFile.builder(packageName(), builder.build()).build();
 
 		// TODO: module identifier
@@ -173,8 +180,7 @@ private void contributeMethod(Method method, RepositoryComposition repositoryCom
 
 		if (repositoryInformation.isQueryMethod(method) && methodContributorFunction != null) {
 
-			MethodContributor<? extends QueryMethod> contributor = methodContributorFunction.apply(method,
-					repositoryInformation);
+			MethodContributor<? extends QueryMethod> contributor = methodContributorFunction.apply(method);
 
 			if (contributor != null) {
 
@@ -234,20 +240,6 @@ public ProjectionFactory getProjectionFactory() {
 		return projectionFactory;
 	}
 
-	/**
-	 * Customizer interface to customize the AOT repository fragment class after it has been defined.
-	 */
-	public interface ClassCustomizer {
-
-		/**
-		 * Apply customization ot the AOT repository fragment class after it has been defined..
-		 *
-		 * @param information the repository information that is used for the AOT fragment.
-		 * @param builder the class builder to be customized.
-		 */
-		void customize(RepositoryInformation information, TypeSpec.Builder builder);
-
-	}
 
 	record AotBundle(JavaFile javaFile, JSONObject metadata) {
 	}

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

@@ -0,0 +1,48 @@
+/*
+ * 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.repository.aot.generate;
+
+import org.springframework.javapoet.TypeSpec;
+
+/**
+ * Builder for AOT repository fragment classes.
+ *
+ * @author Mark Paluch
+ * @since 4.0
+ */
+public interface AotRepositoryClassBuilder {
+
+	/**
+	 * Add a class customizer. Customizer is invoked after building the class.
+	 *
+	 * @param customizer the customizer with direct access to the {@link TypeSpec.Builder type builder}.
+	 */
+	void customize(ClassCustomizer customizer);
+
+	/**
+	 * Customizer interface to customize the AOT repository fragment class after it has been defined.
+	 */
+	interface ClassCustomizer {
+
+		/**
+		 * Apply customization ot the AOT repository fragment class after it has been defined.
+		 *
+		 * @param builder the class builder to be customized.
+		 */
+		void customize(TypeSpec.Builder builder);
+
+	}
+}

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

@@ -15,15 +15,7 @@
  */
 package org.springframework.data.repository.aot.generate;
 
-import java.util.Map.Entry;
-
-import javax.lang.model.element.Modifier;
-
-import org.springframework.core.ResolvableType;
-import org.springframework.data.repository.aot.generate.AotRepositoryFragmentMetadata.ConstructorArgument;
-import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.javapoet.MethodSpec;
-import org.springframework.javapoet.ParameterizedTypeName;
 import org.springframework.javapoet.TypeName;
 
 /**
@@ -33,43 +25,23 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public class AotRepositoryConstructorBuilder {
-
-	private final RepositoryInformation repositoryInformation;
-	private final AotRepositoryFragmentMetadata metadata;
-
-	private ConstructorCustomizer customizer = (info, builder) -> {};
-
-	AotRepositoryConstructorBuilder(RepositoryInformation repositoryInformation, AotRepositoryFragmentMetadata metadata) {
-
-		this.repositoryInformation = repositoryInformation;
-		this.metadata = metadata;
-	}
+public interface AotRepositoryConstructorBuilder {
 
 	/**
 	 * Add constructor parameter and create a field storing its value.
 	 *
 	 * @param parameterName name of the parameter.
 	 * @param type parameter type.
 	 */
-	public void addParameter(String parameterName, Class<?> type) {
-
-		ResolvableType resolvableType = ResolvableType.forClass(type);
-		if (!resolvableType.hasGenerics() || !resolvableType.hasResolvableGenerics()) {
-			addParameter(parameterName, TypeName.get(type));
-			return;
-		}
-
-		addParameter(parameterName, ParameterizedTypeName.get(type, resolvableType.resolveGenerics()));
-	}
+	void addParameter(String parameterName, Class<?> type);
 
 	/**
 	 * Add constructor parameter and create a field storing its value.
 	 *
 	 * @param parameterName name of the parameter.
 	 * @param type parameter type.
 	 */
-	public void addParameter(String parameterName, TypeName type) {
+	default void addParameter(String parameterName, TypeName type) {
 		addParameter(parameterName, type, true);
 	}
 
@@ -80,56 +52,27 @@ public void addParameter(String parameterName, TypeName type) {
 	 * @param type parameter type.
 	 * @param createField whether to create a field for the parameter and assign its value to the field.
 	 */
-	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);
-		}
-	}
+	void addParameter(String parameterName, TypeName type, boolean createField);
 
 	/**
 	 * Add constructor customizer. Customizer is invoked after adding constructor arguments and before assigning
 	 * constructor arguments to fields.
 	 *
 	 * @param customizer the customizer with direct access to the {@link MethodSpec.Builder constructor builder}.
 	 */
-	public void customize(ConstructorCustomizer customizer) {
-		this.customizer = customizer;
-	}
-
-	MethodSpec buildConstructor() {
-
-		MethodSpec.Builder builder = MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC);
-
-		for (Entry<String, ConstructorArgument> parameter : this.metadata.getConstructorArguments().entrySet()) {
-			builder.addParameter(parameter.getValue().typeName(), parameter.getKey());
-		}
-
-		customizer.customize(repositoryInformation, builder);
-
-		for (Entry<String, ConstructorArgument> parameter : this.metadata.getConstructorArguments().entrySet()) {
-			if (parameter.getValue().isForLocalField()) {
-				builder.addStatement("this.$N = $N", parameter.getKey(), parameter.getKey());
-			}
-		}
-
-		return builder.build();
-	}
+	void customize(ConstructorCustomizer customizer);
 
 	/**
 	 * Customizer for the AOT repository constructor.
 	 */
-	public interface ConstructorCustomizer {
+	interface ConstructorCustomizer {
 
 		/**
 		 * Customize the constructor.
 		 *
-		 * @param information the repository information that is used for the AOT fragment.
 		 * @param builder the constructor builder to be customized.
 		 */
-		void customize(RepositoryInformation information, MethodSpec.Builder builder);
+		void customize(MethodSpec.Builder builder);
 
 	}