Fix package tangle between o.s.core and o.s.aot

Closes gh-28496

Author: snicoll

spring-core/src/main/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrar.java renamed to spring-core/src/main/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrar.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.core.annotation;
+package org.springframework.aot.hint.support;
 
 import java.util.stream.Stream;
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.support.RuntimeHintsUtils;
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.core.annotation.Order;
 import org.springframework.lang.Nullable;
 
 /**

spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java renamed to spring-core/src/main/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.io.support;
+package org.springframework.aot.hint.support;
 
 import java.util.List;
 import java.util.Map;
@@ -27,6 +27,7 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeHint;
+import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.core.log.LogMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
@@ -41,13 +42,13 @@
  */
 class SpringFactoriesLoaderRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
 
-	private static List<String> RESOURCE_LOCATIONS =
+	private static final List<String> RESOURCE_LOCATIONS =
 			List.of(SpringFactoriesLoader.FACTORIES_RESOURCE_LOCATION);
 
 	private static final Consumer<TypeHint.Builder> HINT = builder ->
 			builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 
-	private final Log logger = LogFactory.getLog(SpringFactoriesLoaderRuntimeHintsRegistrar.class);
+	private static final Log logger = LogFactory.getLog(SpringFactoriesLoaderRuntimeHintsRegistrar.class);
 
 
 	@Override
@@ -60,7 +61,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 	private void registerHints(RuntimeHints hints, ClassLoader classLoader, String resourceLocation) {
 		hints.resources().registerPattern(resourceLocation);
 		Map<String, List<String>> factories =
-				SpringFactoriesLoader.loadFactoriesResource(classLoader, resourceLocation);
+				ExtendedSpringFactoriesLoader.accessLoadFactoriesResource(classLoader, resourceLocation);
 		factories.forEach((factoryClassName, implementationClassNames) ->
 				registerHints(hints, classLoader, factoryClassName, implementationClassNames));
 	}
@@ -104,4 +105,16 @@ private Class<?> resolveClassName(ClassLoader classLoader, String factoryClassNa
 		}
 	}
 
+	private static class ExtendedSpringFactoriesLoader extends SpringFactoriesLoader {
+
+		public ExtendedSpringFactoriesLoader(@Nullable ClassLoader classLoader, Map<String, List<String>> factories) {
+			super(classLoader, factories);
+		}
+
+		static Map<String, List<String>> accessLoadFactoriesResource(ClassLoader classLoader, String resourceLocation) {
+			return SpringFactoriesLoader.loadFactoriesResource(classLoader, resourceLocation);
+		}
+
+	}
+
 }

spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java

@@ -327,7 +327,7 @@ public static SpringFactoriesLoader forResourceLocation(@Nullable ClassLoader cl
 				new SpringFactoriesLoader(classLoader, loadFactoriesResource(resourceClassLoader, resourceLocation)));
 	}
 
-	static Map<String, List<String>> loadFactoriesResource(ClassLoader classLoader, String resourceLocation) {
+	protected static Map<String, List<String>> loadFactoriesResource(ClassLoader classLoader, String resourceLocation) {
 		Map<String, List<String>> result = new LinkedHashMap<>();
 		try {
 			Enumeration<URL> urls = classLoader.getResources(resourceLocation);

spring-core/src/main/resources/META-INF/spring/aot.factories

@@ -1,3 +1,3 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.core.annotation.CoreAnnotationsRuntimeHintsRegistrar,\
-org.springframework.core.io.support.SpringFactoriesLoaderRuntimeHintsRegistrar
+org.springframework.aot.hint.support.CoreAnnotationsRuntimeHintsRegistrar,\
+org.springframework.aot.hint.support.SpringFactoriesLoaderRuntimeHintsRegistrar

spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java renamed to spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrarTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.annotation;
+package org.springframework.aot.hint.support;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -23,6 +23,8 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.util.ClassUtils;
 

spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java renamed to spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.io.support;
+package org.springframework.aot.hint.support;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,6 +25,9 @@
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeHint;
 import org.springframework.aot.hint.TypeReference;
+import org.springframework.core.io.support.DummyFactory;
+import org.springframework.core.io.support.MyDummyFactory1;
+import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;