Automatic merge of jdk:master into master

Author: duke

make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java

@@ -128,9 +128,10 @@ public class CLDRConverter {
     static Map<String, String> pluralRules;
     static Map<String, String> dayPeriodRules;
 
-    // TZDB Short Names Map
+    // TZDB maps
     private static final Map<String, String> tzdbShortNamesMap = HashMap.newHashMap(512);
     private static final Map<String, String> tzdbSubstLetters = HashMap.newHashMap(512);
+    private static final Map<String, String> tzdbLinks = HashMap.newHashMap(512);
 
     static enum DraftType {
         UNCONFIRMED,
@@ -762,12 +763,32 @@ private static Map<String, Object> extractCurrencyNames(Map<String, Object> map,
 
     private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
         Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);
+        var availableIds = getAvailableZoneIds();
 
-        getAvailableZoneIds().stream().forEach(tzid -> {
+        availableIds.forEach(tzid -> {
             // If the tzid is deprecated, get the data for the replacement id
             String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid))
                                    .orElse(tzid);
+            // Follow link, if needed
+            var tzLink = tzdbLinks.get(tzKey);
+            if (tzLink == null && tzdbLinks.containsValue(tzKey)) {
+                // reverse link search
+                // this is needed as in tzdb, "America/Buenos_Aires" links to
+                // "America/Argentina/Buenos_Aires", but CLDR contains metaZone
+                // "Argentina" only for "America/Buenos_Aires" (as of CLDR 44)
+                // Both tzids should have "Argentina" meta zone names
+                tzLink = tzdbLinks.entrySet().stream()
+                        .filter(e -> e.getValue().equals(tzKey))
+                        .map(Map.Entry::getKey)
+                        .findAny()
+                        .orElse(null);
+
+            }
             Object data = map.get(TIMEZONE_ID_PREFIX + tzKey);
+            if (data == null && tzLink != null) {
+                // data for tzLink
+                data = map.get(TIMEZONE_ID_PREFIX + tzLink);
+            }
 
             if (data instanceof String[] tznames) {
                 // Hack for UTC. UTC is an alias to Etc/UTC in CLDR
@@ -777,20 +798,36 @@ private static Map<String, Object> extractZoneNames(Map<String, Object> map, Str
                     names.put("UTC", META_ETCUTC_ZONE_NAME);
                 } else {
                     // TZDB short names
+                    tznames = Arrays.copyOf(tznames, tznames.length);
                     fillTZDBShortNames(tzid, tznames);
                     names.put(tzid, tznames);
                 }
             } else {
                 String meta = handlerMetaZones.get(tzKey);
+                if (meta == null && tzLink != null) {
+                    // Check for tzLink
+                    meta = handlerMetaZones.get(tzLink);
+                }
                 if (meta != null) {
                     String metaKey = METAZONE_ID_PREFIX + meta;
                     data = map.get(metaKey);
                     if (data instanceof String[] tznames) {
                         // TZDB short names
+                        tznames = Arrays.copyOf((String[])names.getOrDefault(metaKey, tznames), 6);
                         fillTZDBShortNames(tzid, tznames);
                         // Keep the metazone prefix here.
-                        names.put(metaKey, data);
+                        names.putIfAbsent(metaKey, tznames);
                         names.put(tzid, meta);
+                        if (tzLink != null && availableIds.contains(tzLink)) {
+                            names.put(tzLink, meta);
+                        }
+                    }
+                } else if (id.equals("root")) {
+                    // supply TZDB short names if available
+                    if (tzdbShortNamesMap.containsKey(tzid)) {
+                        var tznames = new String[6];
+                        fillTZDBShortNames(tzid, tznames);
+                        names.put(tzid, tznames);
                     }
                 }
             }
@@ -1263,7 +1300,7 @@ private static Map<Locale, String> coverageLevelsMap() throws Exception {
     }
 
     /*
-     * Generates two maps from TZ database files, where they have usual abbreviation
+     * Generates three maps from TZ database files, where they have usual abbreviation
      * of the time zone names as "FORMAT".
      *
      * `tzdbShortNamesMap` maps the time zone id, such as "America/Los_Angeles" to
@@ -1273,53 +1310,46 @@ private static Map<Locale, String> coverageLevelsMap() throws Exception {
      *
      * "America/Los_Angeles" -> "P%sT<NBSP>US"
      *
-     * The other map, `tzdbSubstLetters` maps the Rule to its substitution letters.
+     * The map, `tzdbSubstLetters` maps the Rule to its substitution letters.
      * The key of the map is the Rule name, appended with "<NBSP>std" or "<NBSP>dst"
      * depending on the savings, e.g.,
      *
      * "US<NBSP>std" -> "S"
      * "US<NBSP>dst" -> "D"
      *
-     * These two mappings resolve the short names for time zones in each type,
+     * These mappings resolve the short names for time zones in each type,
      * such as:
      *
      * Standard short name for "America/Los_Angeles" -> "PST"
      * DST short name for "America/Los_Angeles" -> "PDT"
      * Generic short name for "America/Los_Angeles" -> "PT"
+     *
+     * The map, `tzdbLinks` retains `Link`s of time zones. For example,
+     * the mapping:
+     *
+     * "US/Hawaii" -> "Pacific/Honolulu"
+     *
+     * resolves names for "US/Hawaii" correctly with "Pacific/Honolulu"
+     * names.
      */
     private static void generateTZDBShortNamesMap() throws IOException {
         Files.walk(Path.of(tzDataDir), 1, FileVisitOption.FOLLOW_LINKS)
-            .filter(p -> p.toFile().isFile() && !p.endsWith("jdk11_backward"))
+            .filter(p -> p.toFile().isFile())
             .forEach(p -> {
                 try {
                     String zone = null;
                     String rule = null;
                     String format = null;
                     boolean inVanguard = false;
-                    boolean inRearguard = false;
                     for (var line : Files.readAllLines(p)) {
-                        // Interpret the line in rearguard mode so that STD/DST
-                        // correctly handles negative DST cases, such as "GMT/IST"
-                        // vs. "IST/GMT" case for Europe/Dublin
-                        if (inVanguard) {
-                            if (line.startsWith("# Rearguard")) {
-                                inVanguard = false;
-                                inRearguard = true;
-                            }
-                            continue;
-                        } else if (line.startsWith("# Vanguard")) {
+                        // check for Vanguard lines
+                        if (line.startsWith("# Vanguard section")) {
                             inVanguard = true;
                             continue;
                         }
-                        if (inRearguard) {
-                            if (line.startsWith("# End of rearguard")) {
-                                inRearguard = false;
-                                continue;
-                            } else {
-                                if (line.startsWith("#\t")) {
-                                    line = line.substring(1); // omit #
-                                }
-                            }
+                        if (inVanguard && line.startsWith("# Rearguard section")) {
+                            inVanguard = false;
+                            continue;
                         }
                         if (line.isBlank() || line.matches("^[ \t]*#.*")) {
                             // ignore blank/comment lines
@@ -1336,7 +1366,7 @@ private static void generateTZDBShortNamesMap() throws IOException {
                             var zl = line.split("[ \t]+", -1);
                             zone = zl[1];
                             rule = zl[3];
-                            format = zl[4];
+                            format = flipIfNeeded(inVanguard, zl[4]);
                         } else {
                             if (zone != null) {
                                 if (line.startsWith("Rule") ||
@@ -1348,7 +1378,7 @@ private static void generateTZDBShortNamesMap() throws IOException {
                                 } else {
                                     var s = line.split("[ \t]+", -1);
                                     rule = s[2];
-                                    format = s[3];
+                                    format = flipIfNeeded(inVanguard, s[3]);
                                 }
                             }
                         }
@@ -1359,18 +1389,42 @@ private static void generateTZDBShortNamesMap() throws IOException {
                             tzdbSubstLetters.put(rl[1] + NBSP + (rl[8].equals("0") ? STD : DST),
                                     rl[9].replace(NO_SUBST, ""));
                         }
+
+                        // Link line
+                        if (line.startsWith("Link")) {
+                            var ll = line.split("[ \t]+", -1);
+                            tzdbLinks.put(ll[2], ll[1]);
+                        }
+                    }
+
+                    // Last entry
+                    if (zone != null) {
+                        tzdbShortNamesMap.put(zone, format + NBSP + rule);
                     }
                 } catch (IOException ioe) {
                     throw new UncheckedIOException(ioe);
                 }
             });
     }
 
+    // Reverse the std/dst FORMAT in Vanguard so that it
+    // correctly handles negative DST cases, such as "GMT/IST"
+    // vs. "IST/GMT" case for Europe/Dublin
+    private static String flipIfNeeded(boolean inVanguard, String format) {
+        if (inVanguard) {
+            var stddst = format.split("/");
+            if (stddst.length == 2) {
+                return stddst[1] + "/" + stddst[0];
+            }
+        }
+        return format;
+    }
+
     /*
      * Fill the TZDB short names if there is no name provided by the CLDR
      */
     private static void fillTZDBShortNames(String tzid, String[] names) {
-        var val = tzdbShortNamesMap.get(tzid);
+        var val = tzdbShortNamesMap.get(tzdbLinks.getOrDefault(tzid, tzid));
         if (val != null) {
             var format = val.split(NBSP)[0];
             var rule = val.split(NBSP)[1];

make/modules/java.base/Gensrc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 include GensrcCommon.gmk
 
-include gensrc/GensrcLocaleData.gmk
 include gensrc/GensrcCharacterData.gmk
 include gensrc/GensrcMisc.gmk
 include gensrc/GensrcCharsetMapping.gmk
@@ -37,10 +36,6 @@ include gensrc/GensrcModuleLoaderMap.gmk
 include gensrc/GensrcScopedMemoryAccess.gmk
 include gensrc/GensrcRegex.gmk
 
-# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
-# to include.
-TARGETS += $(GENSRC_BASELOCALEDATA)
-
 ################################################################################
 
 CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common