root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

promoted char sequence first

This commit is contained in:
Keith Donald 2010-04-17 20:22:30 +00:00
parent ebbf63f4e0
commit 8464ac90c7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
View File

@ -43,9 +43,8 @@ final class ObjectToStringConverter implements ConditionalGenericConverter {
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
Class<?> sourceClass = sourceType.getObjectType(); Class<?> sourceClass = sourceType.getObjectType();
return String.class.equals(sourceClass) || Number.class.isAssignableFrom(sourceClass) || return CharSequence.class.isAssignableFrom(sourceClass) || Number.class.isAssignableFrom(sourceClass) ||
Boolean.class.equals(sourceClass) || Character.class.equals(sourceClass) || Boolean.class.equals(sourceClass) || Character.class.equals(sourceClass) || StringWriter.class.isAssignableFrom(sourceClass) ||
CharSequence.class.isAssignableFrom(sourceClass) || StringWriter.class.isAssignableFrom(sourceClass) ||
sourceClass.isEnum() || ObjectToObjectConverter.hasValueOfMethodOrConstructor(sourceClass, String.class); sourceClass.isEnum() || ObjectToObjectConverter.hasValueOfMethodOrConstructor(sourceClass, String.class);
} }

7
org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
View File

@ -19,6 +19,7 @@ package org.springframework.core.convert.support;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertNull;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -218,6 +219,12 @@ public class DefaultConversionTests {
assertEquals(Locale.ENGLISH, conversionService.convert("en", Locale.class)); assertEquals(Locale.ENGLISH, conversionService.convert("en", Locale.class));
} }
@Test
public void testStringToString() {
String str = "test";
assertSame(str, conversionService.convert(str, String.class));
}
@Test @Test
public void testNumberToNumber() { public void testNumberToNumber() {
assertEquals(Long.valueOf(1), conversionService.convert(Integer.valueOf(1), Long.class)); assertEquals(Long.valueOf(1), conversionService.convert(Integer.valueOf(1), Long.class));