Fix GenericConversionService selects incorrect converter

Signed-off-by: belljun3395 <[email protected]>

Author: belljun3395

spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java

@@ -343,7 +343,7 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 
 		public boolean matchesFallback(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return (this.typeInfo.getTargetType() == targetType.getObjectType() &&
-					this.targetType.hasUnresolvableGenerics() &&
+					this.targetType.hasUnresolvableGenerics() && targetType.getResolvableType().hasUnresolvableGenerics() &&
 					(!(this.converter instanceof ConditionalConverter conditionalConverter) ||
 							conditionalConverter.matches(sourceType, targetType)));
 		}
@@ -520,7 +520,20 @@ public void remove(Class<?> sourceType, Class<?> targetType) {
 			if (convertersForPair != null) {
 				GenericConverter converter = convertersForPair.getConverter(sourceType, targetType);
 				if (converter != null) {
-					return converter;
+					if (!(converter instanceof ConverterAdapter converterAdapter)) {
+						return converter;
+					}
+
+					if (converterAdapter.matchesFallback(sourceType, targetType)) {
+						return converter;
+					}
+
+					ResolvableType rt = targetType.getResolvableType();
+					ResolvableType ct = converterAdapter.targetType;
+					boolean assignable = rt.isAssignableFromResolvedPart(ct);
+					if (assignable) {
+						return converter;
+					}
 				}
 			}
 			// Check ConditionalConverters for a dynamic match

spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@@ -594,6 +594,19 @@ void stringToListOfMapConverterWithFallbackMatch() {
 		assertThat("foo").isEqualTo(result.get(0).get("bar"));
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	void stringToListOfString() {
+		conversionService.addConverter(new StringToCollectionConverter(conversionService));
+		conversionService.addConverter(new StringToListOfMapConverter());
+
+		List<String> result = (List<String>) conversionService.convert("foo,bar",
+				TypeDescriptor.valueOf(String.class),
+				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(String.class))
+		);
+
+		assertThat(result.get(0)).isEqualTo("foo");
+	}
 
 	@ExampleAnnotation(active = true)
 	public String annotatedString;
@@ -990,5 +1003,4 @@ private static class StringToListOfMapConverter implements Converter<String, Lis
 			return List.of(Map.of("bar", source));
 		}
 	}
-
 }