Merge branch '6.2.x'

# Conflicts:
#	spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
This commit is contained in:
Juergen Hoeller
2025-03-04 18:46:39 +01:00
8 changed files with 50 additions and 13 deletions

View File

@@ -440,6 +440,7 @@ public class InstanceSupplierCodeGenerator {
}
}
record ConstructorDescriptor(String beanName, Constructor<?> constructor, Class<?> publicType) {
Class<?> actualType() {