Add support for ConfigurationSource and Dynamic Projections.

See: #3279
Original Pull Request: #3289

Author: mp911de

pom.xml

@@ -381,7 +381,7 @@
 	</profiles>
 
 	<repositories>
-<repository>
+		<repository>
 			<id>spring-snapshot</id>
 			<url>https://repo.spring.io/snapshot</url>
 			<snapshots>

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

@@ -293,4 +293,22 @@ public String getLimitParameterName() {
 		return getParameterName(queryMethod.getParameters().getLimitIndex());
 	}
 
+	/**
+	 * @return the parameter name for the {@link org.springframework.data.domain.ScrollPosition scroll position parameter}
+	 *         or {@code null} if the method does not declare a scroll position parameter.
+	 */
+	@Nullable
+	public String getScrollPositionParameterName() {
+		return getParameterName(queryMethod.getParameters().getScrollPositionIndex());
+	}
+
+	/**
+	 * @return the parameter name for the {@link Class dynamic projection parameter} or {@code null} if the method does
+	 *         not declare a dynamic projection parameter.
+	 */
+	@Nullable
+	public String getDynamicProjectionParameterName() {
+		return getParameterName(queryMethod.getParameters().getDynamicProjectionIndex());
+	}
+
 }

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

@@ -48,18 +48,25 @@ class MethodMetadata {
 	MethodMetadata(RepositoryInformation repositoryInformation, Method method) {
 
 		this.returnType = repositoryInformation.getReturnType(method).toResolvableType();
-		this.actualReturnType = ResolvableType.forType(repositoryInformation.getReturnedDomainClass(method));
+		this.actualReturnType = repositoryInformation.getReturnedDomainTypeInformation(method).toResolvableType();
 		this.initParameters(repositoryInformation, method, new DefaultParameterNameDiscoverer());
 	}
 
-	@Nullable
-	public String getParameterNameOf(Class<?> type) {
-		for (Entry<String, ParameterSpec> entry : methodArguments.entrySet()) {
-			if (entry.getValue().type.equals(TypeName.get(type))) {
-				return entry.getKey();
-			}
+	private void initParameters(RepositoryInformation repositoryInformation, Method method,
+			ParameterNameDiscoverer nameDiscoverer) {
+
+		ResolvableType repositoryInterface = ResolvableType.forClass(repositoryInformation.getRepositoryInterface());
+
+		for (java.lang.reflect.Parameter parameter : method.getParameters()) {
+
+			MethodParameter methodParameter = MethodParameter.forParameter(parameter);
+			methodParameter.initParameterNameDiscovery(nameDiscoverer);
+			ResolvableType resolvableParameterType = ResolvableType.forMethodParameter(methodParameter, repositoryInterface);
+
+			TypeName parameterType = TypeName.get(resolvableParameterType.getType());
+
+			addParameter(ParameterSpec.builder(parameterType, methodParameter.getParameterName()).build());
 		}
-		return null;
 	}
 
 	ResolvableType getReturnType() {
@@ -96,20 +103,4 @@ Map<String, String> getLocalVariables() {
 		return localVariables;
 	}
 
-	private void initParameters(RepositoryInformation repositoryInformation, Method method,
-			ParameterNameDiscoverer nameDiscoverer) {
-
-		ResolvableType repositoryInterface = ResolvableType.forClass(repositoryInformation.getRepositoryInterface());
-
-		for (java.lang.reflect.Parameter parameter : method.getParameters()) {
-
-			MethodParameter methodParameter = MethodParameter.forParameter(parameter);
-			methodParameter.initParameterNameDiscovery(nameDiscoverer);
-			ResolvableType resolvableParameterType = ResolvableType.forMethodParameter(methodParameter, repositoryInterface);
-
-			TypeName parameterType = TypeName.get(resolvableParameterType.getType());
-
-			addParameter(ParameterSpec.builder(parameterType, methodParameter.getParameterName()).build());
-		}
-	}
 }

src/main/java/org/springframework/data/repository/config/AotRepositoryContext.java

@@ -45,10 +45,17 @@ public interface AotRepositoryContext extends AotContext {
 	 */
 	String getModuleName();
 
+	/**
+	 * @return the repository configuration source.
+	 */
+	RepositoryConfigurationSource getConfigurationSource();
+
 	/**
 	 * @return a {@link Set} of {@link String base packages} to search for repositories.
 	 */
-	Set<String> getBasePackages();
+	default Set<String> getBasePackages() {
+		return getConfigurationSource().getBasePackages().toSet();
+	}
 
 	/**
 	 * @return the {@link Annotation} types used to identify domain types.

src/main/java/org/springframework/data/repository/config/DefaultAotRepositoryContext.java

@@ -46,6 +46,7 @@ class DefaultAotRepositoryContext implements AotRepositoryContext {
 
 	private final RegisteredBean bean;
 	private final String moduleName;
+	private final RepositoryConfigurationSource configurationSource;
 	private final AotContext aotContext;
 	private final RepositoryInformation repositoryInformation;
 	private final Lazy<Set<MergedAnnotation<Annotation>>> resolvedAnnotations = Lazy.of(this::discoverAnnotations);
@@ -56,12 +57,14 @@ class DefaultAotRepositoryContext implements AotRepositoryContext {
 	private String beanName;
 
 	public DefaultAotRepositoryContext(RegisteredBean bean, RepositoryInformation repositoryInformation,
-			String moduleName, AotContext aotContext) {
+			String moduleName, AotContext aotContext, RepositoryConfigurationSource configurationSource) {
 		this.bean = bean;
 		this.repositoryInformation = repositoryInformation;
 		this.moduleName = moduleName;
+		this.configurationSource = configurationSource;
 		this.aotContext = aotContext;
 		this.beanName = bean.getBeanName();
+		this.basePackages = configurationSource.getBasePackages().toSet();
 	}
 
 	public AotContext getAotContext() {
@@ -73,6 +76,11 @@ public String getModuleName() {
 		return moduleName;
 	}
 
+	@Override
+	public RepositoryConfigurationSource getConfigurationSource() {
+		return configurationSource;
+	}
+
 	@Override
 	public ConfigurableListableBeanFactory getBeanFactory() {
 		return getAotContext().getBeanFactory();

src/main/java/org/springframework/data/repository/config/RepositoryRegistrationAotContribution.java

@@ -194,9 +194,9 @@ private void logTrace(String message, Object... arguments) {
 		}
 		RepositoryInformation repositoryInformation = reader.getRepositoryInformation();
 		DefaultAotRepositoryContext repositoryContext = new DefaultAotRepositoryContext(bean, repositoryInformation,
-				extension.getModuleName(), AotContext.from(bean.getBeanFactory(), environment));
+				extension.getModuleName(), AotContext.from(bean.getBeanFactory(), environment),
+				configuration.getConfigurationSource());
 
-		repositoryContext.setBasePackages(repositoryConfiguration.getBasePackages().toSet());
 		repositoryContext.setIdentifyingAnnotations(extension.getIdentifyingAnnotations());
 
 		return repositoryContext;

src/main/java/org/springframework/data/repository/core/RepositoryInformationSupport.java

@@ -89,6 +89,11 @@ public Class<?> getReturnedDomainClass(Method method) {
 		return getMetadata().getReturnedDomainClass(method);
 	}
 
+	@Override
+	public TypeInformation<?> getReturnedDomainTypeInformation(Method method) {
+		return getMetadata().getReturnedDomainTypeInformation(method);
+	}
+
 	@Override
 	public CrudMethods getCrudMethods() {
 		return getMetadata().getCrudMethods();

src/main/java/org/springframework/data/repository/core/RepositoryMetadata.java

@@ -91,10 +91,26 @@ default Class<?> getDomainType() {
 	 *
 	 * @param method
 	 * @return
+	 * @see #getReturnedDomainTypeInformation(Method)
 	 * @see #getReturnType(Method)
 	 */
 	Class<?> getReturnedDomainClass(Method method);
 
+	/**
+	 * Returns the domain type information returned by the given {@link Method}. In contrast to
+	 * {@link #getReturnType(Method)}, this method extracts the type from {@link Collection}s and
+	 * {@link org.springframework.data.domain.Page} as well.
+	 *
+	 * @param method
+	 * @return
+	 * @see #getReturnedDomainClass(Method)
+	 * @see #getReturnType(Method)
+	 * @since 4.0
+	 */
+	default TypeInformation<?> getReturnedDomainTypeInformation(Method method) {
+		return TypeInformation.of(getReturnedDomainClass(method));
+	}
+
 	/**
 	 * Returns {@link CrudMethods} meta information for the repository.
 	 *

src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java

@@ -100,11 +100,16 @@ public TypeInformation<?> getReturnType(Method method) {
 
 	@Override
 	public Class<?> getReturnedDomainClass(Method method) {
+		return getReturnedDomainTypeInformation(method).getType();
+	}
+
+	@Override
+	public TypeInformation<?> getReturnedDomainTypeInformation(Method method) {
 
 		TypeInformation<?> returnType = getReturnType(method);
 		returnType = ReactiveWrapperConverters.unwrapWrapperTypes(returnType);
 
-		return QueryExecutionConverters.unwrapWrapperTypes(returnType, getDomainTypeInformation()).getType();
+		return QueryExecutionConverters.unwrapWrapperTypes(returnType, getDomainTypeInformation());
 	}
 
 	@Override

src/main/java/org/springframework/data/repository/query/QueryMethod.java

@@ -403,7 +403,8 @@ private static void assertReturnTypeAssignable(Method method, Set<Class<?>> type
 			}
 		}
 
-		throw new IllegalStateException("Method has to have one of the following return types " + types);
+		throw new IllegalStateException(
+				"Method '%s' has to have one of the following return types: %s".formatted(method, types));
 	}
 
 	static class QueryMethodValidator {