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,12 @@ 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));
+        }
     }
 
     /**