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

Joda/DateTimeFormatterRegistrar also supports YearMonth and MonthDay

Browse Source 
Issue: SPR-13518
This commit is contained in:
Juergen Hoeller
2015-11-25 23:39:14 +01:00
parent bc0b707175
commit 1da564d2f0
8 changed files with 276 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
View File

@@ -29,7 +29,9 @@ import org.joda.time.Instant;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.LocalTime;
import org.joda.time.MonthDay;
import org.joda.time.Period;
import org.joda.time.YearMonth;
import org.joda.time.chrono.ISOChronology;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +70,6 @@ public class JodaTimeFormattingTests {
private void setUp(JodaTimeFormatterRegistrar registrar) {
conversionService = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(conversionService);
registrar.registerFormatters(conversionService);
JodaTimeBean bean = new JodaTimeBean();
@@ -477,6 +478,24 @@ public class JodaTimeFormattingTests {
assertTrue(binder.getBindingResult().getFieldValue("duration").toString().equals("PT72.345S"));
}
@Test
public void testBindYearMonth() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("yearMonth", "2007-12");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertTrue(binder.getBindingResult().getFieldValue("yearMonth").toString().equals("2007-12"));
}
@Test
public void testBindMonthDay() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("monthDay", "--12-03");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertTrue(binder.getBindingResult().getFieldValue("monthDay").toString().equals("--12-03"));
}
@SuppressWarnings("unused")
private static class JodaTimeBean {
@@ -539,6 +558,10 @@ public class JodaTimeFormattingTests {
private Duration duration;
private YearMonth yearMonth;
private MonthDay monthDay;
private final List<JodaTimeBean> children = new ArrayList<JodaTimeBean>();
public LocalDate getLocalDate() {
@@ -718,6 +741,22 @@ public class JodaTimeFormattingTests {
this.duration = duration;
}
public YearMonth getYearMonth() {
return yearMonth;
}
public void setYearMonth(YearMonth yearMonth) {
this.yearMonth = yearMonth;
}
public MonthDay getMonthDay() {
return monthDay;
}
public void setMonthDay(MonthDay monthDay) {
this.monthDay = monthDay;
}
public List<JodaTimeBean> getChildren() {
return children;
}

41
spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
View File

@@ -21,7 +21,9 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.MonthDay;
import java.time.Period;
import java.time.YearMonth;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
@@ -66,7 +68,6 @@ public class DateTimeFormattingTests {
private void setUp(DateTimeFormatterRegistrar registrar) {
conversionService = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(conversionService);
registrar.registerFormatters(conversionService);
DateTimeBean bean = new DateTimeBean();
@@ -354,6 +355,24 @@ public class DateTimeFormattingTests {
assertTrue(binder.getBindingResult().getFieldValue("duration").toString().equals("PT8H6M12.345S"));
}
@Test
public void testBindYearMonth() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("yearMonth", "2007-12");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertTrue(binder.getBindingResult().getFieldValue("yearMonth").toString().equals("2007-12"));
}
@Test
public void testBindMonthDay() {
MutablePropertyValues propertyValues = new MutablePropertyValues();
propertyValues.add("monthDay", "--12-03");
binder.bind(propertyValues);
assertEquals(0, binder.getBindingResult().getErrorCount());
assertTrue(binder.getBindingResult().getFieldValue("monthDay").toString().equals("--12-03"));
}
public static class DateTimeBean {
@@ -390,6 +409,10 @@ public class DateTimeFormattingTests {
private Duration duration;
private YearMonth yearMonth;
private MonthDay monthDay;
private final List<DateTimeBean> children = new ArrayList<DateTimeBean>();
public LocalDate getLocalDate() {
@@ -496,6 +519,22 @@ public class DateTimeFormattingTests {
this.duration = duration;
}
public YearMonth getYearMonth() {
return yearMonth;
}
public void setYearMonth(YearMonth yearMonth) {
this.yearMonth = yearMonth;
}
public MonthDay getMonthDay() {
return monthDay;
}
public void setMonthDay(MonthDay monthDay) {
this.monthDay = monthDay;
}
public List<DateTimeBean> getChildren() {
return children;
}