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

correctly handle ParseException from Formatter for String->String case (SPR-8944)

This commit is contained in:
Juergen Hoeller 2011-12-22 14:57:23 +01:00 committed by Chris Beams
parent 0053319c62
commit 86bef9030f
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
View File

@ -244,6 +244,9 @@ class TypeConverterDelegate {
} }
if (firstAttemptEx != null) { if (firstAttemptEx != null) {
if (editor == null) {
throw firstAttemptEx;
}
logger.debug("Original ConversionService attempt failed - ignored since " + logger.debug("Original ConversionService attempt failed - ignored since " +
"PropertyEditor based conversion eventually succeeded", firstAttemptEx); "PropertyEditor based conversion eventually succeeded", firstAttemptEx);
} }

25
org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.text.ParseException;
import java.util.AbstractList; import java.util.AbstractList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -51,8 +52,8 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.context.support.StaticMessageSource; import org.springframework.context.support.StaticMessageSource;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.format.Formatter;
import org.springframework.format.number.NumberFormatter; import org.springframework.format.number.NumberFormatter;
import org.springframework.format.support.FormattingConversionService; import org.springframework.format.support.FormattingConversionService;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -374,6 +375,28 @@ public class DataBinderTests extends TestCase {
} }
} }
public void testBindingErrorWithStringFormatter() {
TestBean tb = new TestBean();
DataBinder binder = new DataBinder(tb);
FormattingConversionService conversionService = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(conversionService);
conversionService.addFormatterForFieldType(String.class, new Formatter<String>() {
public String parse(String text, Locale locale) throws ParseException {
throw new ParseException(text, 0);
}
public String print(String object, Locale locale) {
return object;
}
});
binder.setConversionService(conversionService);
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("name", "test");
binder.bind(pvs);
assertTrue(binder.getBindingResult().hasFieldErrors("name"));
assertEquals("test", binder.getBindingResult().getFieldValue("name"));
}
public void testBindingWithFormatterAgainstList() { public void testBindingWithFormatterAgainstList() {
BeanWithIntegerList tb = new BeanWithIntegerList(); BeanWithIntegerList tb = new BeanWithIntegerList();
DataBinder binder = new DataBinder(tb); DataBinder binder = new DataBinder(tb);