diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java index b5a3b09dc4c..aa29be49d00 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java @@ -19,7 +19,6 @@ package org.springframework.format.datetime.joda; import java.util.Calendar; import java.util.Date; -import org.joda.time.DateMidnight; import org.joda.time.DateTime; import org.joda.time.Instant; import org.joda.time.LocalDate; @@ -51,6 +50,7 @@ final class JodaTimeConverters { * Install the converters into the converter registry. * @param registry the converter registry */ + @SuppressWarnings("deprecation") public static void registerConverters(ConverterRegistry registry) { DateFormatterRegistrar.addDateConverters(registry); @@ -68,8 +68,6 @@ final class JodaTimeConverters { registry.addConverter(new LongToReadableInstantConverter()); registry.addConverter(new LocalDateTimeToLocalDateConverter()); registry.addConverter(new LocalDateTimeToLocalTimeConverter()); - registry.addConverter(new LocalDateToDateMidnightConverter()); - registry.addConverter(new DateMidnightToLocalDateConverter()); } @@ -100,10 +98,11 @@ final class JodaTimeConverters { } - private static class DateTimeToDateMidnightConverter implements Converter { + @Deprecated + private static class DateTimeToDateMidnightConverter implements Converter { @Override - public DateMidnight convert(DateTime source) { + public org.joda.time.DateMidnight convert(DateTime source) { return source.toDateMidnight(); } } @@ -213,22 +212,4 @@ final class JodaTimeConverters { } } - - private static class LocalDateToDateMidnightConverter implements Converter { - - @Override - public DateMidnight convert(LocalDate source) { - return source.toDateMidnight(); - } - } - - - private static class DateMidnightToLocalDateConverter implements Converter { - - @Override - public LocalDate convert(DateMidnight source) { - return source.toLocalDate(); - } - } - }