SPR-8718 Revert fix from earlier for now (need a different approach).

org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java

@@ -24,7 +24,6 @@ import java.util.Locale;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -69,8 +68,6 @@ public class NumberFormattingTests {
 		LocaleContextHolder.setLocale(null);
 	}
 
-	// TODO [SPR-8718] determine why changes to GenericConversionService broke this test
-	@Ignore("Disabled until SPR-8718 is resolved")
 	@Test
 	public void testDefaultNumberFormatting() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();

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

@@ -485,7 +485,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 	}
 	
 	@SuppressWarnings("unchecked")
-	private final class ConverterAdapter implements ConditionalGenericConverter {
+	private final class ConverterAdapter implements GenericConverter {
 
 		private final ConvertiblePair typeInfo;
 
@@ -500,11 +500,6 @@ public class GenericConversionService implements ConfigurableConversionService {
 			return Collections.singleton(this.typeInfo);
 		}
 
-		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-			return (typeInfo.getTargetType().equals(targetType.getObjectType()) &&
-					typeInfo.getSourceType().isAssignableFrom(sourceType.getObjectType()));
-		}
-
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if (source == null) {
 				return convertNullSource(sourceType, targetType);

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

@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
@@ -209,6 +210,7 @@ public class GenericConversionServiceTests {
 	// SPR-8718
 	
 	@Test(expected=ConverterNotFoundException.class)
+	@Ignore("TODO")
 	public void convertSuperTarget() {
 		conversionService.addConverter(new ColorConverter());
 		conversionService.convert("#000000", SystemColor.class);