archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8287340: Refactor old code using StringTokenizer in locale related code

Browse source 
Reviewed-by: iris, joehw
This commit is contained in:
Naoto Sato 2022-06-02 18:35:20 +00:00
parent ccec5d1e85
commit 26d24263c7
4 changed files with 115 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
View file

@ -33,14 +33,12 @@ import java.text.spi.BreakIteratorProvider;
import java.text.spi.CollatorProvider; import java.text.spi.CollatorProvider;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.spi.CalendarDataProvider; import java.util.spi.CalendarDataProvider;
import java.util.spi.CalendarNameProvider; import java.util.spi.CalendarNameProvider;
@ -63,13 +61,13 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
// parent locales map // parent locales map
private static volatile Map<Locale, Locale> parentLocalesMap; private static volatile Map<Locale, Locale> parentLocalesMap;
// language aliases map
private static volatile Map<String,String> langAliasesMap;
// cache to hold locale to locale mapping for language aliases. // cache to hold locale to locale mapping for language aliases.
private static final Map<Locale, Locale> langAliasesCache; private static final Map<Locale, Locale> langAliasesCache;
// cache the available locales
private static volatile Locale[] AVAILABLE_LOCALES;
static { static {
parentLocalesMap = new ConcurrentHashMap<>(); parentLocalesMap = new ConcurrentHashMap<>();
langAliasesMap = new ConcurrentHashMap<>();
langAliasesCache = new ConcurrentHashMap<>(); langAliasesCache = new ConcurrentHashMap<>();
// Assuming these locales do NOT have irregular parent locales. // Assuming these locales do NOT have irregular parent locales.
parentLocalesMap.put(Locale.ROOT, Locale.ROOT); parentLocalesMap.put(Locale.ROOT, Locale.ROOT);
@ -175,29 +173,19 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
@Override @Override
public Locale[] getAvailableLocales() { public Locale[] getAvailableLocales() {
Set<String> all = createLanguageTagSet("AvailableLocales"); if (AVAILABLE_LOCALES == null) {
Locale[] locs = new Locale[all.size()]; AVAILABLE_LOCALES = createLanguageTagSet("AvailableLocales").stream()
int index = 0; .map(Locale::forLanguageTag)
for (String tag : all) { .toArray(Locale[]::new);
locs[index++] = Locale.forLanguageTag(tag);
} }
return locs; return AVAILABLE_LOCALES;
} }
private static Locale applyAliases(Locale loc) { private static Locale applyAliases(Locale loc) {
if (langAliasesMap.isEmpty()) { return langAliasesCache.computeIfAbsent(loc, l -> {
langAliasesMap = baseMetaInfo.getLanguageAliasMap(); var alias = baseMetaInfo.getLanguageAliasMap().get(l.toLanguageTag());
} return alias != null ? Locale.forLanguageTag(alias) : l;
Locale locale = langAliasesCache.get(loc); });
if (locale == null) {
String locTag = loc.toLanguageTag();
Locale aliasLocale = langAliasesMap.containsKey(locTag)
? Locale.forLanguageTag(langAliasesMap.get(locTag)) : loc;
langAliasesCache.putIfAbsent(loc, aliasLocale);
return aliasLocale;
} else {
return locale;
}
} }
@Override @Override
@ -220,15 +208,9 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
supportedLocaleString = nonBaseTags; supportedLocaleString = nonBaseTags;
} }
} }
if (supportedLocaleString == null) { return supportedLocaleString != null ?
return Collections.emptySet(); Set.of(supportedLocaleString.split("\s+")) :
} Collections.emptySet();
StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
Set<String> tagset = new HashSet<>((tokens.countTokens() * 4 + 2) / 3);
while (tokens.hasMoreTokens()) {
tagset.add(tokens.nextToken());
}
return tagset;
} }
// Implementation of ResourceBundleBasedAdapter // Implementation of ResourceBundleBasedAdapter

53
src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
View file

@ -26,7 +26,6 @@
package sun.util.locale.provider; package sun.util.locale.provider;
import java.security.AccessController; import java.security.AccessController;
import java.security.AccessControlException;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.security.PrivilegedActionException; import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
@ -36,15 +35,13 @@ import java.text.spi.DateFormatProvider;
import java.text.spi.DateFormatSymbolsProvider; import java.text.spi.DateFormatSymbolsProvider;
import java.text.spi.DecimalFormatSymbolsProvider; import java.text.spi.DecimalFormatSymbolsProvider;
import java.text.spi.NumberFormatProvider; import java.text.spi.NumberFormatProvider;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.ServiceConfigurationError;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.spi.CalendarDataProvider; import java.util.spi.CalendarDataProvider;
@ -437,7 +434,7 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
*/ */
@Override @Override
public Locale[] getAvailableLocales() { public Locale[] getAvailableLocales() {
return AvailableJRELocales.localeList.clone(); return AvailableJRELocales.localeList;
} }
public Set<String> getLanguageTagSet(String category) { public Set<String> getLanguageTagSet(String category) {
@ -454,16 +451,9 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
protected Set<String> createLanguageTagSet(String category) { protected Set<String> createLanguageTagSet(String category) {
String supportedLocaleString = createSupportedLocaleString(category); String supportedLocaleString = createSupportedLocaleString(category);
if (supportedLocaleString == null) { return supportedLocaleString != null ?
return Collections.emptySet(); Set.of(supportedLocaleString.split("\s+")) :
} Collections.emptySet();
StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
Set<String> tagset = new HashSet<>((tokens.countTokens() * 4 + 2) / 3);
while (tokens.hasMoreTokens()) {
tagset.add(tokens.nextToken());
}
return tagset;
} }
private static String createSupportedLocaleString(String category) { private static String createSupportedLocaleString(String category) {
@ -520,28 +510,17 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
throw new InternalError("No available locales for JRE"); throw new InternalError("No available locales for JRE");
} }
StringTokenizer localeStringTokenizer = new StringTokenizer(supportedLocaleString); return Arrays.stream(supportedLocaleString.split("\s+"))
.map(t -> {
int length = localeStringTokenizer.countTokens(); return switch (t) {
Locale[] locales = new Locale[length + 1]; case "ja-JP-JP" -> JRELocaleConstants.JA_JP_JP;
locales[0] = Locale.ROOT; case "no-NO-NY" -> JRELocaleConstants.NO_NO_NY;
for (int i = 1; i <= length; i++) { case "th-TH-TH" -> JRELocaleConstants.TH_TH_TH;
String currentToken = localeStringTokenizer.nextToken(); default -> Locale.forLanguageTag(t);
switch (currentToken) { };
case "ja-JP-JP": })
locales[i] = JRELocaleConstants.JA_JP_JP; .distinct()
break; .toArray(Locale[]::new);
case "no-NO-NY":
locales[i] = JRELocaleConstants.NO_NO_NY;
break;
case "th-TH-TH":
locales[i] = JRELocaleConstants.TH_TH_TH;
break;
default:
locales[i] = Locale.forLanguageTag(currentToken);
}
}
return locales;
} }
@Override @Override

30
src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -33,6 +33,7 @@ import java.text.spi.DateFormatSymbolsProvider;
import java.text.spi.DecimalFormatSymbolsProvider; import java.text.spi.DecimalFormatSymbolsProvider;
import java.text.spi.NumberFormatProvider; import java.text.spi.NumberFormatProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -308,23 +309,16 @@ public abstract class LocaleProviderAdapter {
} }
public static Locale[] toLocaleArray(Set<String> tags) { public static Locale[] toLocaleArray(Set<String> tags) {
Locale[] locs = new Locale[tags.size() + 1]; return tags.stream()
int index = 0; .map(t -> {
locs[index++] = Locale.ROOT; return switch (t) {
for (String tag : tags) { case "ja-JP-JP" -> JRELocaleConstants.JA_JP_JP;
switch (tag) { case "no-NO-NY" -> JRELocaleConstants.NO_NO_NY;
case "ja-JP-JP": case "th-TH-TH" -> JRELocaleConstants.TH_TH_TH;
locs[index++] = JRELocaleConstants.JA_JP_JP; default -> Locale.forLanguageTag(t);
break; };
case "th-TH-TH": })
locs[index++] = JRELocaleConstants.TH_TH_TH; .toArray(Locale[]::new);
break;
default:
locs[index++] = Locale.forLanguageTag(tag);
break;
}
}
return locs;
} }
/** /**

155
test/jdk/sun/util/locale/provider/Bug8038436.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8038436 8158504 8065555 8167143 8167273 8189272 * @bug 8038436 8158504 8065555 8167143 8167273 8189272 8287340
* @summary Test for changes in 8038436 * @summary Test for changes in 8038436
* @modules java.base/sun.util.locale.provider * @modules java.base/sun.util.locale.provider
* java.base/sun.util.spi * java.base/sun.util.spi
@ -32,18 +32,9 @@
* @run main/othervm -Djava.locale.providers=COMPAT Bug8038436 availlocs * @run main/othervm -Djava.locale.providers=COMPAT Bug8038436 availlocs
*/ */
import java.security.CodeSource;
import java.security.Permission;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
import java.security.ProtectionDomain;
import java.util.Arrays; import java.util.Arrays;
import java.util.Formatter;
import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.stream.Collectors;
import sun.util.locale.provider.LocaleProviderAdapter; import sun.util.locale.provider.LocaleProviderAdapter;
public class Bug8038436 { public class Bug8038436 {
@ -61,73 +52,74 @@ public class Bug8038436 {
} }
static final String[] bipLocs = ("ar, ar-JO, ar-LB, ar-SY, be, be-BY, bg, " + static final String[] bipLocs = (", ar, ar_JO, ar_LB, ar_SY, be, be_BY, bg, " +
"bg-BG, ca, ca-ES, cs, cs-CZ, da, da-DK, de, de-AT, de-CH, de-DE, " + "bg_BG, ca, ca_ES, cs, cs_CZ, da, da_DK, de, de_AT, de_CH, de_DE, " +
"de-LU, el, el-CY, el-GR, en, en-AU, en-CA, en-GB, en-IE, en-IN, " + "de_LU, el, el_CY, el_GR, en, en_AU, en_CA, en_GB, en_IE, en_IN, " +
"en-MT, en-NZ, en-PH, en-SG, en-US, en-ZA, es, es-AR, es-BO, es-CL, " + "en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, es, es_AR, es_BO, es_CL, " +
"es-CO, es-CR, es-DO, es-EC, es-ES, es-GT, es-HN, es-MX, es-NI, " + "es_CO, es_CR, es_DO, es_EC, es_ES, es_GT, es_HN, es_MX, es_NI, " +
"es-PA, es-PE, es-PR, es-PY, es-SV, es-US, es-UY, es-VE, et, et-EE, " + "es_PA, es_PE, es_PR, es_PY, es_SV, es_US, es_UY, es_VE, et, et_EE, " +
"fi, fi-FI, fr, fr-BE, fr-CA, fr-CH, fr-FR, ga, ga-IE, he, he-IL, " + "fi, fi_FI, fr, fr_BE, fr_CA, fr_CH, fr_FR, ga, ga_IE, he, he_IL, " +
"hi-IN, hr, hr-HR, hu, hu-HU, id, id-ID, is, is-IS, it, it-CH, it-IT, " + "hi_IN, hr, hr_HR, hu, hu_HU, id, id_ID, is, is_IS, it, it_CH, it_IT, " +
"ja, ja-JP, ko, ko-KR, lt, lt-LT, lv, lv-LV, mk, mk-MK, ms, ms-MY, mt, " + "ja, ja_JP, ko, ko_KR, lt, lt_LT, lv, lv_LV, mk, mk_MK, ms, ms_MY, mt, " +
"mt-MT, nb, nb-NO, nl, nl-BE, nl-NL, nn-NO, no, no-NO, no-NO, pl, pl-PL, pt, pt-BR, " + "mt_MT, nb, nb_NO, nl, nl_BE, nl_NL, nn_NO, no, no_NO, no_NO_NY, pl, pl_PL, pt, pt_BR, " +
"pt-PT, ro, ro-RO, ru, ru-RU, sk, sk-SK, sl, sl-SI, sq, sq-AL, sr, " + "pt_PT, ro, ro_RO, ru, ru_RU, sk, sk_SK, sl, sl_SI, sq, sq_AL, sr, " +
"sr-BA, sr-CS, sr-Latn, sr-Latn-ME, sr-ME, sr-RS, sv, sv-SE, th, th-TH, " + "sr_BA, sr_CS, sr_ME, sr_ME_#Latn, sr_RS, sr__#Latn, sv, sv_SE, th, th_TH, " +
"tr, tr-TR, uk, uk-UA, und, vi, vi-VN, zh, zh-CN, zh-HK, zh-Hans-CN, " + "tr, tr_TR, uk, uk_UA, vi, vi_VN, zh, zh_CN, zh_CN_#Hans, zh_HK, " +
"zh-Hans-SG, zh-Hant-HK, zh-Hant-TW, zh-SG, zh-TW, ").split(",\\s*"); "zh_HK_#Hant, zh_SG, zh_SG_#Hans, zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] dfpLocs = bipLocs; static final String[] dfpLocs = bipLocs;
static final String[] datefspLocs = bipLocs; static final String[] datefspLocs = bipLocs;
static final String[] decimalfspLocs = bipLocs; static final String[] decimalfspLocs = bipLocs;
static final String[] calnpLocs = bipLocs; static final String[] calnpLocs = bipLocs;
static final String[] cpLocs = ("ar, be, bg, ca, cs, da, el, es, et, fi, " + static final String[] cpLocs = (", ar, be, bg, ca, cs, da, el, es, et, fi, " +
"fr, he, hi, hr, hu, is, ja, ko, lt, lv, mk, nb, nb-NO, nn-NO, no, pl, ro, ru, sk, sl, " + "fr, he, hi, hr, hu, is, ja, ko, lt, lv, mk, nb, nb_NO, nn_NO, no, pl, ro, ru, sk, sl, " +
"sq, sr, sr-Latn, sv, th, tr, uk, und, vi, zh, zh-HK, zh-Hant-HK, " + "sq, sr, sr__#Latn, sv, th, tr, uk, vi, zh, zh_HK, zh_HK_#Hant, " +
"zh-Hant-TW, zh-TW, ").split(",\\s*"); "zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] nfpLocs = ("ar, ar-AE, ar-BH, ar-DZ, ar-EG, ar-IQ, " + static final String[] nfpLocs = (", ar, ar_AE, ar_BH, ar_DZ, ar_EG, ar_IQ, " +
"ar-JO, ar-KW, ar-LB, ar-LY, ar-MA, ar-OM, ar-QA, ar-SA, ar-SD, ar-SY, " + "ar_JO, ar_KW, ar_LB, ar_LY, ar_MA, ar_OM, ar_QA, ar_SA, ar_SD, ar_SY, " +
"ar-TN, ar-YE, be, be-BY, bg, bg-BG, ca, ca-ES, cs, cs-CZ, da, da-DK, " + "ar_TN, ar_YE, be, be_BY, bg, bg_BG, ca, ca_ES, cs, cs_CZ, da, da_DK, " +
"de, de-AT, de-CH, de-DE, de-LU, el, el-CY, el-GR, en, en-AU, " + "de, de_AT, de_CH, de_DE, de_LU, el, el_CY, el_GR, en, en_AU, " +
"en-CA, en-GB, en-IE, en-IN, en-MT, en-NZ, en-PH, en-SG, en-US, en-ZA, " + "en_CA, en_GB, en_IE, en_IN, en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, " +
"es, es-AR, es-BO, es-CL, es-CO, es-CR, es-CU, es-DO, es-EC, es-ES, " + "es, es_AR, es_BO, es_CL, es_CO, es_CR, es_CU, es_DO, es_EC, es_ES, " +
"es-GT, es-HN, es-MX, es-NI, es-PA, es-PE, es-PR, es-PY, es-SV, es-US, " + "es_GT, es_HN, es_MX, es_NI, es_PA, es_PE, es_PR, es_PY, es_SV, es_US, " +
"es-UY, es-VE, et, et-EE, fi, fi-FI, fr, fr-BE, fr-CA, fr-CH, fr-FR, " + "es_UY, es_VE, et, et_EE, fi, fi_FI, fr, fr_BE, fr_CA, fr_CH, fr_FR, " +
"fr-LU, ga, ga-IE, he, he-IL, hi, hi-IN, hr, hr-HR, hu, hu-HU, id, " + "fr_LU, ga, ga_IE, he, he_IL, hi, hi_IN, hr, hr_HR, hu, hu_HU, id, " +
"id-ID, is, is-IS, it, it-CH, it-IT, ja, ja-JP, " + "id_ID, is, is_IS, it, it_CH, it_IT, ja, ja_JP, " +
"ja-JP-u-ca-japanese-x-lvariant-JP, ko, ko-KR, lt, lt-LT, lv, lv-LV, " + "ja_JP_JP_#u-ca-japanese, ko, ko_KR, lt, lt_LT, lv, lv_LV, " +
"mk, mk-MK, ms, ms-MY, mt, mt-MT, nb, nb-NO, nl, nl-BE, nl-NL, nn-NO, " + "mk, mk_MK, ms, ms_MY, mt, mt_MT, nb, nb_NO, nl, nl_BE, nl_NL, nn_NO, " +
"nn-NO, no, no-NO, pl, pl-PL, pt, pt-BR, pt-PT, ro, ro-RO, ru, ru-RU, " + "no, no_NO, no_NO_NY, pl, pl_PL, pt, pt_BR, pt_PT, ro, ro_RO, ru, ru_RU, " +
"sk, sk-SK, sl, sl-SI, sq, sq-AL, sr, sr-BA, sr-CS, sr-Latn, " + "sk, sk_SK, sl, sl_SI, sq, sq_AL, sr, sr_BA, sr_BA_#Latn, sr_CS, sr_ME, " +
"sr-Latn-BA, sr-Latn-ME, sr-Latn-RS, sr-ME, sr-RS, sv, sv-SE, th, " + "sr_ME_#Latn, sr_RS, sr_RS_#Latn, sr__#Latn, sv, sv_SE, th, " +
"th-TH, th-TH-u-nu-thai-x-lvariant-TH, tr, tr-TR, uk, uk-UA, und, vi, " + "th_TH, th_TH_TH_#u-nu-thai, tr, tr_TR, uk, uk_UA, vi, " +
"vi-VN, zh, zh-CN, zh-HK, zh-Hans-CN, zh-Hans-SG, zh-Hant-HK, " + "vi_VN, zh, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, " +
"zh-Hant-TW, zh-SG, zh-TW, ").split(",\\s*"); "zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] currencynpLocs = ("ar-AE, ar-BH, ar-DZ, ar-EG, ar-IQ, " + static final String[] currencynpLocs = (", ar_AE, ar_BH, ar_DZ, ar_EG, ar_IQ, " +
"ar-JO, ar-KW, ar-LB, ar-LY, ar-MA, ar-OM, ar-QA, ar-SA, ar-SD, ar-SY, " + "ar_JO, ar_KW, ar_LB, ar_LY, ar_MA, ar_OM, ar_QA, ar_SA, ar_SD, ar_SY, " +
"ar-TN, ar-YE, be-BY, bg-BG, ca-ES, cs-CZ, da-DK, de, de-AT, de-CH, " + "ar_TN, ar_YE, be_BY, bg_BG, ca_ES, cs_CZ, da_DK, de, de_AT, de_CH, " +
"de-DE, de-LU, el-CY, el-GR, en-AU, en-CA, en-GB, en-IE, en-IN, " + "de_DE, de_LU, el_CY, el_GR, en_AU, en_CA, en_GB, en_IE, en_IN, " +
"en-MT, en-NZ, en-PH, en-SG, en-US, en-ZA, es, es-AR, es-BO, es-CL, " + "en_MT, en_NZ, en_PH, en_SG, en_US, en_ZA, es, es_AR, es_BO, es_CL, " +
"es-CO, es-CR, es-CU, es-DO, es-EC, es-ES, es-GT, es-HN, es-MX, es-NI, " + "es_CO, es_CR, es_CU, es_DO, es_EC, es_ES, es_GT, es_HN, es_MX, es_NI, " +
"es-PA, es-PE, es-PR, es-PY, es-SV, es-US, es-UY, es-VE, et-EE, fi-FI, " + "es_PA, es_PE, es_PR, es_PY, es_SV, es_US, es_UY, es_VE, et_EE, fi_FI, " +
"fr, fr-BE, fr-CA, fr-CH, fr-FR, fr-LU, ga-IE, he-IL, hi-IN, hr-HR, " + "fr, fr_BE, fr_CA, fr_CH, fr_FR, fr_LU, ga_IE, he_IL, hi_IN, hr_HR, " +
"hu-HU, id-ID, is-IS, it, it-CH, it-IT, ja, ja-JP, ko, ko-KR, lt-LT, " + "hu_HU, id_ID, is_IS, it, it_CH, it_IT, ja, ja_JP, ko, ko_KR, lt_LT, " +
"lv-LV, mk-MK, ms-MY, mt-MT, nb, nb-NO, nl-BE, nl-NL, nn-NO, no-NO, pl-PL, pt, pt-BR, " + "lv_LV, mk_MK, ms_MY, mt_MT, nb, nb_NO, nl_BE, nl_NL, nn_NO, no_NO, pl_PL, pt, pt_BR, " +
"pt-PT, ro-RO, ru-RU, sk-SK, sl-SI, sq-AL, sr-BA, sr-CS, sr-Latn-BA, " + "pt_PT, ro_RO, ru_RU, sk_SK, sl_SI, sq_AL, sr_BA, sr_BA_#Latn, sr_CS, " +
"sr-Latn-ME, sr-Latn-RS, sr-ME, sr-RS, sv, sv-SE, th-TH, tr-TR, uk-UA, " + "sr_ME, sr_ME_#Latn, sr_RS, sr_RS_#Latn, sv, sv_SE, th_TH, tr_TR, uk_UA, " +
"und, vi-VN, zh-CN, zh-HK, zh-Hans-CN, zh-Hans-SG, zh-Hant-HK, " + "vi_VN, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, " +
"zh-Hant-TW, zh-SG, zh-TW, ").split(",\\s*"); "zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] lnpLocs = ("ar, be, bg, ca, cs, da, de, el, el-CY, " + static final String[] lnpLocs = (", ar, be, bg, ca, cs, da, de, el, el_CY, " +
"en, en-MT, en-PH, en-SG, es, es-US, et, fi, fr, ga, he, hi, hr, hu, " + "en, en_MT, en_PH, en_SG, es, es_US, et, fi, fr, ga, he, hi, hr, hu, " +
"id, is, it, ja, ko, lt, lv, mk, ms, mt, nb, nb-NO, nl, nn-NO, no, no-NO, pl, pt, pt-BR, " + "id, is, it, ja, ko, lt, lv, mk, ms, mt, nb, nb_NO, nl, nn_NO, no, no_NO_NY, pl, pt, pt_BR, " +
"pt-PT, ro, ru, sk, sl, sq, sr, sr-Latn, sv, th, tr, uk, und, vi, zh, " + "pt_PT, ro, ru, sk, sl, sq, sr, sr__#Latn, sv, th, tr, uk, vi, zh, " +
"zh-HK, zh-Hans-SG, zh-Hant-HK, zh-Hant-TW, zh-SG, zh-TW, ").split(",\\s*"); "zh_HK, zh_HK_#Hant, zh_SG, zh_SG_#Hans, zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] tznpLocs = ("de, en, en-CA, en-GB, en-IE, es, fr, hi, " + static final String[] tznpLocs = (", de, en, en_CA, en_GB, en_IE, es, fr, hi, " +
"it, ja, ko, nb, nb-NO, nn-NO, pt-BR, sv, und, zh-CN, zh-HK, zh-Hans-CN, zh-Hant-HK, " + "it, ja, ko, nb, nb_NO, nn_NO, pt_BR, sv, zh_CN, zh_CN_#Hans, zh_HK, zh_HK_#Hant, " +
"zh-Hant-TW, zh-TW, ").split(",\\s*"); "zh_TW, zh_TW_#Hant, ").split(",\\s*");
static final String[] caldpLocs = ("ar, be, bg, ca, cs, da, de, el, el-CY, " + static final String[] caldpLocs = (", ar, be, bg, ca, cs, da, de, el, el_CY, " +
"en, en-GB, en-IE, en-MT, es, es-ES, es-US, et, fi, fr, fr-CA, he, hi, " + "en, en_GB, en_IE, en_MT, es, es_ES, es_US, et, fi, fr, fr_CA, he, hi, " +
"hr, hu, id-ID, is, it, ja, ko, lt, lv, mk, ms-MY, mt, mt-MT, nb, nb-NO, nl, nn-NO, no, " + "hr, hu, id_ID, is, it, ja, ko, lt, lv, mk, ms_MY, mt, mt_MT, nb, nb_NO, nl, nn_NO, no, " +
"pl, pt, pt-BR, pt-PT, ro, ru, sk, sl, sq, sr, sr-Latn-BA, sr-Latn-ME, " + "pl, pt, pt_BR, pt_PT, ro, ru, sk, sl, sq, sr, sr_BA_#Latn, sr_ME_#Latn, sr_RS_#Latn, " +
"sr-Latn-RS, sv, th, tr, uk, und, vi, zh, ").split(",\\s*"); "sv, th, tr, uk, vi, zh, ").split(",\\s*");
static final String[] calpLocs = caldpLocs; static final String[] calpLocs = caldpLocs;
/* /*
@ -167,18 +159,15 @@ public class Bug8038436 {
private static void checkAvailableLocales(String testName, Locale[] got, String[] expected) { private static void checkAvailableLocales(String testName, Locale[] got, String[] expected) {
System.out.println("Testing available locales for " + testName); System.out.println("Testing available locales for " + testName);
List<Locale> gotList = Arrays.asList(got).stream() List<String> gotList = Arrays.stream(got)
.map(Locale::toLanguageTag) .map(Locale::toString)
.sorted() .sorted()
.map(Locale::forLanguageTag) .toList();
.collect(Collectors.toList()); List<String> expectedList = Arrays.stream(expected)
List<Locale> expectedList = Arrays.asList(expected).stream() .toList();
.map(Locale::forLanguageTag)
.collect(Collectors.toList());
if (!gotList.equals(expectedList)) { if (!gotList.equals(expectedList)) {
throw new RuntimeException("\n" + gotList.toString() + "\n is not equal to \n" + throw new RuntimeException("\n" + gotList + "\n is not equal to \n" + expectedList);
expectedList.toString());
} }
} }
} }