Removes week_year date format (#63384)

week_year is replaced by weekyear. This is a single field YYYY date format. follow up after a deprecation #63307 relates #60707
elastic · Oct 12, 2020 · 15a2a35 · 15a2a35
1 parent b8dabce
commit 15a2a35
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 19 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/joda/Joda.java b/server/src/main/java/org/elasticsearch/common/joda/Joda.java
@@ -148,11 +148,6 @@ public static JodaDateFormatter forPattern(String input) {
             formatter = ISODateTimeFormat.weekDateTime();
         } else if ("weekDateTimeNoMillis".equals(input) || "week_date_time_no_millis".equals(input)) {
             formatter = ISODateTimeFormat.weekDateTimeNoMillis();
-        } else if ("week_year".equals(input)) {
-            deprecationLogger.getOrCompute()
-                .deprecate("week_year_format_name", "Format name \"week_year\" is deprecated and will be removed in a future version. " +
-                    "Use \"weekyear\" format instead");
-            formatter = ISODateTimeFormat.weekyear();
         } else if ("weekyear".equals(input) ) {
             formatter = ISODateTimeFormat.weekyear();
         } else if ("weekyearWeek".equals(input) || "weekyear_week".equals(input)) {

diff --git a/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java b/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
@@ -1170,10 +1170,6 @@ public class DateFormatters {
     /*
      * Returns a formatter for a four digit weekyear. (YYYY)
      */
-    private static final DateFormatter WEEK_YEAR = new JavaDateFormatter("week_year",
-        new DateTimeFormatterBuilder().appendValue(WEEK_FIELDS_ROOT.weekBasedYear()).toFormatter(Locale.ROOT)
-                                      .withResolverStyle(ResolverStyle.STRICT));
-
     private static final DateFormatter WEEKYEAR = new JavaDateFormatter("weekyear",
         new DateTimeFormatterBuilder().appendValue(WEEK_FIELDS_ROOT.weekBasedYear()).toFormatter(Locale.ROOT)
             .withResolverStyle(ResolverStyle.STRICT));
@@ -1723,11 +1719,6 @@ public class DateFormatters {
             return WEEK_DATE_TIME;
         } else if (FormatNames.WEEK_DATE_TIME_NO_MILLIS.matches(input)) {
             return WEEK_DATE_TIME_NO_MILLIS;
-        } else if (FormatNames.WEEK_YEAR.matches(input)) {
-            deprecationLogger.getOrCompute()
-                .deprecate("week_year_format_name", "Format name \"week_year\" is deprecated and will be removed in a future version. " +
-                    "Use \"weekyear\" format instead");
-            return WEEK_YEAR;
         } else if (FormatNames.WEEKYEAR.matches(input)) {
             return WEEKYEAR;
         } else if (FormatNames.WEEK_YEAR_WEEK.matches(input)) {

diff --git a/server/src/main/java/org/elasticsearch/common/time/FormatNames.java b/server/src/main/java/org/elasticsearch/common/time/FormatNames.java
@@ -58,7 +58,6 @@ public enum FormatNames {
     WEEK_DATE("week_date"),
     WEEK_DATE_TIME("week_date_time"),
     WEEK_DATE_TIME_NO_MILLIS("week_date_time_no_millis"),
-    WEEK_YEAR("week_year"),
     WEEKYEAR("weekyear"),
     WEEK_YEAR_WEEK("weekyear_week"),
     WEEKYEAR_WEEK_DAY("weekyear_week_day"),

diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
@@ -128,7 +128,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -876,9 +875,7 @@ private static String randomJodaAndJavaSupportedTimezone(List<String> zoneIds) {
      * Generate a random valid date formatter pattern.
      */
     public static String randomDateFormatterPattern() {
-        //WEEKYEAR should be used instead of WEEK_YEAR
-        EnumSet<FormatNames> formatNames = EnumSet.complementOf(EnumSet.of(FormatNames.WEEK_YEAR));
-        return randomFrom(formatNames).getName();
+        return randomFrom(FormatNames.values()).getName();
     }
 
     /**