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

do not register default formatters for Date and Calendar (requiring explicit use of @DateTimeFormat there)

This commit is contained in:
Juergen Hoeller 2009-12-03 23:26:08 +00:00
parent 73a75220a8
commit 0a36596468
3 changed files with 3 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java
View File

@ -111,8 +111,6 @@ public class JodaTimeFormattingConfigurer {
Printer<ReadableInstant> readableInstantPrinter = new ReadableInstantPrinter(jodaDateTimeFormatter); Printer<ReadableInstant> readableInstantPrinter = new ReadableInstantPrinter(jodaDateTimeFormatter);
formatterRegistry.addFormatterForFieldType(ReadableInstant.class, readableInstantPrinter, dateTimeParser); formatterRegistry.addFormatterForFieldType(ReadableInstant.class, readableInstantPrinter, dateTimeParser);
formatterRegistry.addFormatterForFieldType(Calendar.class, readableInstantPrinter, dateTimeParser);
formatterRegistry.addFormatterForFieldType(Date.class, new MillisecondInstantPrinter(jodaDateTimeFormatter), dateTimeParser);
formatterRegistry.addFormatterForFieldAnnotation(new DateTimeFormatAnnotationFormatterFactory()); formatterRegistry.addFormatterForFieldAnnotation(new DateTimeFormatAnnotationFormatterFactory());
} }

2
org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
View File

@ -292,11 +292,13 @@ public class JodaTimeFormattingTests {
@DateTimeFormat(style="MS") @DateTimeFormat(style="MS")
private DateTime dateTimeAnnotated; private DateTime dateTimeAnnotated;
@DateTimeFormat
private Date date; private Date date;
@DateTimeFormat(style="S-") @DateTimeFormat(style="S-")
private Date dateAnnotated; private Date dateAnnotated;
@DateTimeFormat
private Calendar calendar; private Calendar calendar;
@DateTimeFormat(style="S-") @DateTimeFormat(style="S-")

64
org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
View File

@ -1,64 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.format.support;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Locale;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.core.convert.ConversionService;
/**
* @author Keith Donald
* @author Juergen Hoeller
*/
public class FormattingConversionServiceFactoryBeanTests {
private ConversionService conversionService;
@Before
public void setUp() {
FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean();
factory.afterPropertiesSet();
this.conversionService = factory.getObject();
LocaleContextHolder.setLocale(Locale.US);
}
@After
public void tearDown() {
LocaleContextHolder.setLocale(null);
}
@Test
public void testFormatNumber() {
BigDecimal value = conversionService.convert("3000.25", BigDecimal.class);
assertEquals("3000.25", conversionService.convert(value, String.class));
}
@Test
public void testFormatDate() {
Date value = conversionService.convert("10/29/09 12:00 PM", Date.class);
assertEquals("10/29/09 12:00 PM", conversionService.convert(value, String.class));
}
}