CLDR-18325 Make CLDRFile.DEFAULT_ITERATION_INCLUDES_EXTRAS true (#4457)

Author: btangmu

tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java

@@ -562,7 +562,8 @@ private Map<JSONSection, List<CldrItem>> mapPathsToSections(
         // read paths in DTD order. The order is critical for JSON processing.
         final CLDRFile.Status status = new CLDRFile.Status();
         for (Iterator<String> it =
-                        file.iterator("", DtdData.getInstance(fileDtdType).getDtdComparator(null));
+                        file.iteratorWithoutExtras(
+                                "", DtdData.getInstance(fileDtdType).getDtdComparator(null));
                 it.hasNext(); ) {
             int cv = Level.UNDETERMINED.getLevel();
             final String path = it.next();

tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowData.java

@@ -187,13 +187,13 @@ public static void main(String[] args) throws Exception {
 
                 // get all of the paths
                 Set<String> allPaths = new HashSet<>();
-                file.forEach(allPaths::add);
+                file.iterableWithoutExtras().forEach(allPaths::add);
 
                 if (!locale.equals("root")) {
                     for (String childLocale : children) {
                         CLDRFile childCldrFile = cldrFactory.make(childLocale, false);
                         if (childCldrFile != null) {
-                            childCldrFile.forEach(allPaths::add);
+                            childCldrFile.iterableWithoutExtras().forEach(allPaths::add);
                         }
                         sublocales.put(childLocale, childCldrFile);
                     }

tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java

@@ -1474,7 +1474,7 @@ public static Set<String> getMatchingXMLFiles(File[] sourceDirs, Matcher m) {
         return s;
     }
 
-    private final boolean DEFAULT_ITERATION_INCLUDES_EXTRAS = false;
+    private final boolean DEFAULT_ITERATION_INCLUDES_EXTRAS = true;
 
     public Iterator<String> iterator() {
         if (DEFAULT_ITERATION_INCLUDES_EXTRAS) {
@@ -1533,7 +1533,7 @@ private Iterator<String> iteratorWithoutExtras(Matcher pathFilter) {
         return dataSource.iterator(pathFilter);
     }
 
-    private Iterator<String> iteratorWithoutExtras(String prefix, Comparator<String> comparator) {
+    public Iterator<String> iteratorWithoutExtras(String prefix, Comparator<String> comparator) {
         Iterator<String> it =
                 (prefix == null || prefix.isEmpty())
                         ? dataSource.iterator()
@@ -1554,7 +1554,7 @@ public Iterable<String> iterableDefault() {
         }
     }
 
-    private Iterable<String> iterableWithoutExtras() {
+    public Iterable<String> iterableWithoutExtras() {
         return this::iteratorWithoutExtras;
     }