Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

full support for formatters on array/collection elements (SPR-6504)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-12-04 00:34:40 +00:00
parent 388edd7aaa
commit e161c93f8d
6 changed files with 97 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
View File

@@ -117,10 +117,11 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
if (this.conversionService != null) {
// Try custom formatter...
TypeDescriptor td = getPropertyAccessor().getPropertyTypeDescriptor(fixedField);
return this.conversionService.convert(value, td, TypeDescriptor.valueOf(String.class));
} else {
return value;
if (td != null) {
return this.conversionService.convert(value, td, TypeDescriptor.valueOf(String.class));
}
}
return value;
}
/**

63
org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.format.number;
import java.math.BigDecimal;
import java.util.Locale;
import java.util.List;
import org.junit.After;
import static org.junit.Assert.*;
@@ -102,6 +103,43 @@ public class NumberFormattingTests {
assertEquals("1,25.00", binder.getBindingResult().getFieldValue("pattern"));
}
@Test
public void testPatternArrayFormatting() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("patternArray", new String[] {"1,25.00", "2,35.00"});
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertEquals("1,25.00", binder.getBindingResult().getFieldValue("patternArray[0]"));
assertEquals("2,35.00", binder.getBindingResult().getFieldValue("patternArray[1]"));
propertyValues = new MutablePropertyValues();
propertyValues.add("patternArray[0]", "1,25.00");
propertyValues.add("patternArray[1]", "2,35.00");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertEquals("1,25.00", binder.getBindingResult().getFieldValue("patternArray[0]"));
assertEquals("2,35.00", binder.getBindingResult().getFieldValue("patternArray[1]"));
}
@Test
public void testPatternListFormatting() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("patternList", new String[] {"1,25.00", "2,35.00"});
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertEquals("1,25.00", binder.getBindingResult().getFieldValue("patternList[0]"));
assertEquals("2,35.00", binder.getBindingResult().getFieldValue("patternList[1]"));
propertyValues = new MutablePropertyValues();
propertyValues.add("patternList[0]", "1,25.00");
propertyValues.add("patternList[1]", "2,35.00");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertEquals("1,25.00", binder.getBindingResult().getFieldValue("patternList[0]"));
assertEquals("2,35.00", binder.getBindingResult().getFieldValue("patternList[1]"));
}
@SuppressWarnings("unused")
private static class TestBean {
@@ -119,6 +157,12 @@ public class NumberFormattingTests {
@NumberFormat(pattern="#,##.00")
private BigDecimal pattern;
@NumberFormat(pattern="#,##.00")
private BigDecimal[] patternArray;
@NumberFormat(pattern="#,##.00")
private List[] patternList;
public Integer getNumberDefault() {
return numberDefault;
}
@@ -159,6 +203,21 @@ public class NumberFormattingTests {
this.pattern = pattern;
}
public BigDecimal[] getPatternArray() {
return patternArray;
}
public void setPatternArray(BigDecimal[] patternArray) {
this.patternArray = patternArray;
}
public List[] getPatternList() {
return patternList;
}
public void setPatternList(List[] patternList) {
this.patternList = patternList;
}
}
}
}