Merge branch '6.2.x'

# Conflicts:
#	spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java
#	spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java

Author: jhoeller

spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -28,6 +28,7 @@
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.util.ClassUtils;
 
 /**
  * Gather the need for resources available at runtime.
@@ -51,14 +52,14 @@ public ResourceHints() {
 		this.resourceBundleHints = new LinkedHashSet<>();
 	}
 
+
 	/**
 	 * Return the resources that should be made available at runtime.
 	 * @return a stream of {@link ResourcePatternHints}
 	 */
 	public Stream<ResourcePatternHints> resourcePatternHints() {
 		Stream<ResourcePatternHints> patterns = this.resourcePatternHints.stream();
-		return (this.types.isEmpty() ? patterns
-				: Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
+		return (this.types.isEmpty() ? patterns : Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
 	}
 
 	/**
@@ -71,18 +72,18 @@ public Stream<ResourceBundleHint> resourceBundleHints() {
 
 	/**
 	 * Register a pattern if the given {@code location} is available on the
-	 * classpath. This delegates to {@link ClassLoader#getResource(String)}
-	 * which validates directories as well. The location is not included in
-	 * the hint.
-	 * @param classLoader the classloader to use
+	 * classpath. This delegates to {@link ClassLoader#getResource(String)} which
+	 * validates directories as well. The location is not included in the hint.
+	 * @param classLoader the ClassLoader to use, or {@code null} for the default
 	 * @param location a '/'-separated path name that should exist
 	 * @param resourceHint a builder to customize the resource pattern
 	 * @return {@code this}, to facilitate method chaining
 	 */
 	public ResourceHints registerPatternIfPresent(@Nullable ClassLoader classLoader, String location,
 			Consumer<ResourcePatternHints.Builder> resourceHint) {
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader());
-		if (classLoaderToUse.getResource(location) != null) {
+
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
+		if (classLoaderToUse != null && classLoaderToUse.getResource(location) != null) {
 			registerPattern(resourceHint);
 		}
 		return this;

spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-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.
@@ -39,8 +39,7 @@ public interface RuntimeHintsRegistrar {
 	/**
 	 * Contribute hints to the given {@link RuntimeHints} instance.
 	 * @param hints the hints contributed so far for the deployment unit
-	 * @param classLoader the classloader, or {@code null} if even the system
-	 * ClassLoader is not accessible
+	 * @param classLoader the ClassLoader to use, or {@code null} for the default
 	 */
 	void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader);
 

spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-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.
@@ -24,6 +24,7 @@
 
 import org.springframework.aot.hint.ResourceHints;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ResourceUtils;
 
 /**
@@ -58,19 +59,21 @@ private FilePatternResourceHintsRegistrar(List<String> filePrefixes, List<String
 
 
 	private void registerHints(ResourceHints hints, @Nullable ClassLoader classLoader) {
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader());
-		List<String> includes = new ArrayList<>();
-		for (String location : this.classpathLocations) {
-			if (classLoaderToUse.getResource(location) != null) {
-				for (String filePrefix : this.filePrefixes) {
-					for (String fileExtension : this.fileExtensions) {
-						includes.add(location + filePrefix + "*" + fileExtension);
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
+		if (classLoaderToUse != null) {
+			List<String> includes = new ArrayList<>();
+			for (String location : this.classpathLocations) {
+				if (classLoaderToUse.getResource(location) != null) {
+					for (String filePrefix : this.filePrefixes) {
+						for (String fileExtension : this.fileExtensions) {
+							includes.add(location + filePrefix + "*" + fileExtension);
+						}
 					}
 				}
 			}
-		}
-		if (!includes.isEmpty()) {
-			hints.registerPattern(hint -> hint.includes(includes.toArray(String[]::new)));
+			if (!includes.isEmpty()) {
+				hints.registerPattern(hint -> hint.includes(includes.toArray(String[]::new)));
+			}
 		}
 	}
 
@@ -257,8 +260,7 @@ private FilePatternResourceHintsRegistrar build() {
 		 * classpath location that resolves against the {@code ClassLoader}, files
 		 * with the configured file prefixes and extensions are registered.
 		 * @param hints the hints contributed so far for the deployment unit
-		 * @param classLoader the classloader, or {@code null} if even the system
-		 * ClassLoader isn't accessible
+		 * @param classLoader the ClassLoader to use, or {@code null} for the default
 		 */
 		public void registerHints(ResourceHints hints, @Nullable ClassLoader classLoader) {
 			build().registerHints(hints, classLoader);

spring-core/src/main/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-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.
@@ -48,10 +48,11 @@ class SpringFactoriesLoaderRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader :
-				SpringFactoriesLoaderRuntimeHints.class.getClassLoader());
-		for (String resourceLocation : RESOURCE_LOCATIONS) {
-			registerHints(hints, classLoaderToUse, resourceLocation);
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
+		if (classLoaderToUse != null) {
+			for (String resourceLocation : RESOURCE_LOCATIONS) {
+				registerHints(hints, classLoaderToUse, resourceLocation);
+			}
 		}
 	}