Move runtime hints into another package

Original Pull Request: #2624

Author: christophstrobl

src/main/java/org/springframework/data/ManagedTypes.java

@@ -28,6 +28,7 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.data.util.TypeScanner;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -118,7 +119,7 @@ default boolean isTypePresent(@NonNull String typeName) {
 	 */
 	@NonNull
 	default TypeScanner getTypeScanner() {
-		return new TypeScanner(getClassLoader());
+		return TypeScanner.typeScanner(getClassLoader());
 	}
 
 	/**
@@ -129,14 +130,12 @@ default TypeScanner getTypeScanner() {
 	 * model {@link Class types}; must not be {@literal null}.
 	 * @param packageNames {@link Collection} of {@link String package names} to scan.
 	 * @return a {@link Set} of {@link Class types} found during the scan.
-	 * @see TypeScanner#scanForTypesAnnotatedWith(Class[])
-	 * @see TypeScanner.Scanner#inPackages(Collection)
 	 * @see #getTypeScanner()
 	 */
 	default Set<Class<?>> scanPackageForTypes(@NonNull Collection<Class<? extends Annotation>> identifyingAnnotations,
 			Collection<String> packageNames) {
 
-		return getTypeScanner().scanForTypesAnnotatedWith(identifyingAnnotations).inPackages(packageNames);
+		return getTypeScanner().scanPackages(packageNames).forTypesAnnotatedWith(identifyingAnnotations).collectAsSet();
 	}
 
 	/**

src/main/java/org/springframework/data/aot/AotContext.java

@@ -22,7 +22,6 @@
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
-import org.springframework.data.aot.TypeScanner.Scanner;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.util.Lazy;
 
@@ -128,12 +127,10 @@ protected Set<Class<?>> discoverTypes() {
 
 		if (!getIdentifyingAnnotations().isEmpty()) {
 
-			Scanner typeScanner = aotContext.getTypeScanner().scanForTypesAnnotatedWith(getIdentifyingAnnotations());
-			Set<Class<?>> classes = typeScanner.inPackages(getBasePackages());
+			Set<Class<?>> classes = aotContext.getTypeScanner().scanPackages(getBasePackages()).forTypesAnnotatedWith(getIdentifyingAnnotations()).collectAsSet();
 			types.addAll(TypeCollector.inspect(classes).list());
 		}
 
-		// context.get
 		return types;
 	}
 }