bugfix: Refactor timezone validation logic in FastDateParser to 3-digit timezone IDs, which have been deprecated in JDK 25

Author: lprimak

src/main/java/org/apache/commons/lang3/time/FastDateParser.java

@@ -23,6 +23,7 @@
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -46,7 +47,9 @@
 
 import org.apache.commons.lang3.ArraySorter;
 import org.apache.commons.lang3.CharUtils;
+import org.apache.commons.lang3.JavaVersion;
 import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 /**
  * FastDateParser is a fast and thread-safe version of {@link java.text.SimpleDateFormat}.
@@ -532,7 +535,7 @@ public String toString() {
             for (final String[] zoneNames : zones) {
                 // offset 0 is the time zone ID and is not localized
                 final String tzId = zoneNames[ID];
-                if (tzId.equalsIgnoreCase(TimeZones.GMT_ID)) {
+                if (isInvalidTimeZoneId(tzId)) {
                     continue;
                 }
                 final TimeZone tz = TimeZone.getTimeZone(tzId);
@@ -561,7 +564,7 @@ public String toString() {
             }
             // Order is undefined.
             for (final String tzId : ArraySorter.sort(TimeZone.getAvailableIDs())) {
-                if (tzId.equalsIgnoreCase(TimeZones.GMT_ID)) {
+                if (isInvalidTimeZoneId(tzId)) {
                     continue;
                 }
                 final TimeZone tz = TimeZone.getTimeZone(tzId);
@@ -612,6 +615,11 @@ public String toString() {
             return "TimeZoneStrategy [locale=" + locale + ", tzNames=" + tzNames + ", pattern=" + pattern + "]";
         }
 
+        private static boolean isInvalidTimeZoneId(String tzId) {
+            return tzId.equalsIgnoreCase(TimeZones.GMT_ID)
+                    || SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_25)
+                    && ZoneId.SHORT_IDS.containsKey(tzId);
+        }
     }
 
     /**

src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java

@@ -23,6 +23,7 @@
 
 import java.text.DateFormatSymbols;
 import java.text.ParseException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -110,6 +111,9 @@ private void testTimeZoneStrategyPattern_DateFormatSymbols_getZoneStrings(final
 
         final String[][] zones = getZoneStringsSorted(locale);
         for (final String[] zone : zones) {
+            if (isInvalidZoneId(zone[0])) {
+                continue;
+            }
             for (int zIndex = 1; zIndex < zone.length; ++zIndex) {
                 final String tzDisplay = zone[zIndex];
                 if (tzDisplay == null) {
@@ -171,6 +175,9 @@ private void testTimeZoneStrategyPattern_TimeZone_getAvailableIDs(final Locale l
         assumeFalse(LocaleUtils.isLanguageUndetermined(locale), () -> toFailureMessage(locale, null, null));
         assumeTrue(LocaleUtils.isAvailableLocale(locale), () -> toFailureMessage(locale, null, null));
         for (final String id : ArraySorter.sort(TimeZone.getAvailableIDs())) {
+            if (isInvalidZoneId(id)) {
+                continue;
+            }
             final TimeZone timeZone = TimeZone.getTimeZone(id);
             final String displayName = timeZone.getDisplayName(locale);
             final FastDateParser parser = new FastDateParser("z", timeZone, locale);
@@ -226,4 +233,12 @@ private String toFailureMessage(final Locale locale, final String languageTag, f
         return String.format("locale = %s, languageTag = '%s', isAvailableLocale = %s, isLanguageUndetermined = %s, timeZone = %s", languageTag, locale,
                 LocaleUtils.isAvailableLocale(locale), LocaleUtils.isLanguageUndetermined(locale), TimeZones.toTimeZone(timeZone));
     }
+
+    /**
+     * skip short IDs on Java 25+ as they are not supported there
+     */
+    private boolean isInvalidZoneId(final String zoneId) {
+        return SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_25)
+                && ZoneId.SHORT_IDS.containsKey(zoneId);
+    }
 }