Merge branch '6.2.x'

spring-projects · Jan 27, 2025 · 5574f45 · 5574f45
2 parents 1167b30 + 34d6dd9
commit 5574f45
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.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.

diff --git a/...a/org/springframework/aot/hint/annotation/RegisterReflectionReflectiveProcessorTests.java b/...a/org/springframework/aot/hint/annotation/RegisterReflectionReflectiveProcessorTests.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.
@@ -180,10 +180,7 @@ public void setDescription(String description) {
 	@RegisterReflection(memberCategories = MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)
 	static class AnnotatedSimplePojo {
 
-		String test;
-
 		AnnotatedSimplePojo(String test) {
-			this.test = test;
 		}
 	}
 

diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.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.
@@ -405,7 +405,10 @@ void someMethod(T theArg, Object otherArg) {
 	}
 
 
-	public abstract static class SubBar<T extends StringBuffer> extends InterBar<T> {
+	public abstract static class SubBar<T extends StringProducer> extends InterBar<T> {
+	}
+
+	public interface StringProducer extends CharSequence {
 	}
 
 

diff --git a/...src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/...src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -570,12 +570,12 @@ void stringListToListOfSubclassOfUnboundGenericClass() {
 		conversionService.addConverter(new StringListToAListConverter());
 		conversionService.addConverter(new StringListToBListConverter());
 
-		List<ARaw> aList = (List<ARaw>) conversionService.convert(List.of("foo"),
+		List<?> aList = (List<?>) conversionService.convert(List.of("foo"),
 				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(String.class)),
 				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(ARaw.class)));
 		assertThat(aList).allMatch(e -> e instanceof ARaw);
 
-		List<BRaw> bList = (List<BRaw>) conversionService.convert(List.of("foo"),
+		List<?> bList = (List<?>) conversionService.convert(List.of("foo"),
 				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(String.class)),
 				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(BRaw.class)));
 		assertThat(bList).allMatch(e -> e instanceof BRaw);
@@ -943,9 +943,11 @@ public Color convert(String source) {
 	private static class GenericBaseClass<T> {
 	}
 
+	@SuppressWarnings("rawtypes")
 	private static class ARaw extends GenericBaseClass {
 	}
 
+	@SuppressWarnings("rawtypes")
 	private static class BRaw extends GenericBaseClass {
 	}
 

diff --git a/...ng-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java b/...ng-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.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.