Formatting support for java.time.Year and java.time.Month

Issue: SPR-16437

spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -21,10 +21,12 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.Month;
 import java.time.MonthDay;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 import java.time.Period;
+import java.time.Year;
 import java.time.YearMonth;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -190,6 +192,8 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
 		registry.addFormatterForFieldType(Instant.class, new InstantFormatter());
 		registry.addFormatterForFieldType(Period.class, new PeriodFormatter());
 		registry.addFormatterForFieldType(Duration.class, new DurationFormatter());
+		registry.addFormatterForFieldType(Year.class, new YearFormatter());
+		registry.addFormatterForFieldType(Month.class, new MonthFormatter());
 		registry.addFormatterForFieldType(YearMonth.class, new YearMonthFormatter());
 		registry.addFormatterForFieldType(MonthDay.class, new MonthDayFormatter());
 

spring-context/src/main/java/org/springframework/format/datetime/standard/MonthFormatter.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2018 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.datetime.standard;
+
+import java.text.ParseException;
+import java.time.Month;
+import java.util.Locale;
+
+import org.springframework.format.Formatter;
+
+/**
+ * {@link Formatter} implementation for a JSR-310 {@link Month},
+ * resolving a given String against the Month enum values (ignoring case).
+ *
+ * @author Juergen Hoeller
+ * @since 5.0.4
+ * @see Month#valueOf
+ */
+class MonthFormatter implements Formatter<Month> {
+
+	@Override
+	public Month parse(String text, Locale locale) throws ParseException {
+		return Month.valueOf(text.toUpperCase());
+	}
+
+	@Override
+	public String print(Month object, Locale locale) {
+		return object.toString();
+	}
+
+}

spring-context/src/main/java/org/springframework/format/datetime/standard/YearFormatter.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2018 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.datetime.standard;
+
+import java.text.ParseException;
+import java.time.Year;
+import java.util.Locale;
+
+import org.springframework.format.Formatter;
+
+/**
+ * {@link Formatter} implementation for a JSR-310 {@link Year},
+ * following JSR-310's parsing rules for a Year.
+ *
+ * @author Juergen Hoeller
+ * @since 5.0.4
+ * @see Year#parse
+ */
+class YearFormatter implements Formatter<Year> {
+
+	@Override
+	public Year parse(String text, Locale locale) throws ParseException {
+		return Year.parse(text);
+	}
+
+	@Override
+	public String print(Year object, Locale locale) {
+		return object.toString();
+	}
+
+}