Merge branch '6.2.x'

sbrannen · sbrannen · commit 5a0848b57902 · 2025-03-05T14:10:41.000+01:00
diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -473,7 +473,7 @@ interface AbstractType {
 
 	public static class InheritsDefaultMethod implements InterfaceWithDefaultMethod<InheritsDefaultMethod.ConcreteType> {
 
-		static class ConcreteType implements AbstractType {
+		static class ConcreteType implements InterfaceWithDefaultMethod.AbstractType {
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ interface AbstractType {`
`473`	`473`
`474`	`474`	`public static class InheritsDefaultMethod implements InterfaceWithDefaultMethod<InheritsDefaultMethod.ConcreteType> {`
`475`	`475`
`476`		`- static class ConcreteType implements AbstractType {`
	`476`	`+ static class ConcreteType implements InterfaceWithDefaultMethod.AbstractType {`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`