Fix: rebase with main and clean up

Signed-off-by: anaconda875 <hflbtmax@gmail.com>

Author: anaconda875

spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java

@@ -209,15 +209,15 @@ else if (genericType instanceof WildcardType wildcardType) {
 								wildcardType, ResolvableType.forType(lowerBound))
 								.getType();
 					}
-				} else if (originalUpperBound.length == 1) {
+				}
+				else if (originalUpperBound.length == 1) {
 					Type upperBound = resolveType(originalUpperBound[0], contextClass);
 					if (upperBound != originalUpperBound[0]) {
 						return ResolvableType.forWildCardTypeWithUpperBound(
 								wildcardType, ResolvableType.forType(upperBound))
 								.getType();
 					}
 				}
-				return wildcardType;
 			}
 		}
 		return genericType;

spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java

@@ -264,10 +264,11 @@ void resolveTypeFromWildcardType(String methodName) {
 
 	@Test
 	void resolveTypeFromNestedParameterizedType() {
-		Type resolvedType = resolveType(method(MyInterfaceType.class, "get").getGenericReturnType(), MyCollectionInterfaceType.class);
+		Type rawReturnType = method(MyInterfaceType.class, "get").getGenericReturnType();
+		Type resolvedType = resolveType(rawReturnType, MyCollectionInterfaceType.class);
 		assertThat(resolvedType).isEqualTo(method(MyCollectionInterfaceType.class, "get").getGenericReturnType());
 
-		resolvedType = resolveType(method(MyInterfaceType.class, "get").getGenericReturnType(), MyOptionalInterfaceType.class);
+		resolvedType = resolveType(rawReturnType, MyOptionalInterfaceType.class);
 		assertThat(resolvedType).isEqualTo(method(MyOptionalInterfaceType.class, "get").getGenericReturnType());
 	}
 

spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

@@ -1607,13 +1607,13 @@ private static ResolvableTypeAssert assertThatResolvableType(ResolvableType type
 	@SuppressWarnings("unused")
 	private HashMap<Integer, List<String>> myMap;
 
+
 	@SuppressWarnings("serial")
 	static class ExtendsList extends ArrayList<CharSequence> {
-
 	}
+
 	@SuppressWarnings("serial")
 	static class ExtendsMap extends HashMap<String, Integer> {
-
 	}