CLDR-17560 skip more cases of ReportId.valueOf("supplemental")

unicode-org · Jun 11, 2024 · e5a6840 · e5a6840
1 parent c5c2381
commit e5a6840
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ReportsDB.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/ReportsDB.java
@@ -121,6 +121,12 @@ public UserReport[] getAllReports(Integer onlyId, CLDRLocale onlyLoc) throws SQL
             while (rs.next()) {
                 final int user = rs.getInt("submitter");
                 final String report = rs.getString("report");
+                ReportId reportId;
+                try {
+                    reportId = ReportId.valueOf(report);
+                } catch (IllegalArgumentException iae) {
+                    continue; // skip illegal enum values. may be a 'retired' enum
+                }
                 final String locale = rs.getString("locale");
                 final Boolean completed = rs.getBoolean("completed");
                 final Boolean acceptable = rs.getBoolean("acceptable");
@@ -129,11 +135,7 @@ public UserReport[] getAllReports(Integer onlyId, CLDRLocale onlyLoc) throws SQL
                 // now update it
                 UserReport userReport = l.computeIfAbsent(user, (i) -> new UserReport(i));
                 userReport.update(
-                        locale,
-                        ReportId.valueOf(report),
-                        completed,
-                        acceptable,
-                        new Date(last_mod.getTime()));
+                        locale, reportId, completed, acceptable, new Date(last_mod.getTime()));
             }
         }
         return l.values().toArray(new UserReport[l.size()]);
@@ -157,6 +159,12 @@ public VoterReportStatus<Integer> clone(Integer onlyId, CLDRLocale onlyLoc)
             while (rs.next()) {
                 final int user = rs.getInt("submitter");
                 final String report = rs.getString("report");
+                ReportId reportId;
+                try {
+                    reportId = ReportId.valueOf(report);
+                } catch (IllegalArgumentException iae) {
+                    continue; // skip illegal enum values. may be a 'retired' enum
+                }
                 final String locale = rs.getString("locale");
                 final Boolean completed = rs.getBoolean("completed");
                 final Boolean acceptable = rs.getBoolean("acceptable");
@@ -166,7 +174,7 @@ public VoterReportStatus<Integer> clone(Integer onlyId, CLDRLocale onlyLoc)
                 copy.markReportComplete(
                         user,
                         CLDRLocale.getInstance(locale),
-                        ReportId.valueOf(report),
+                        reportId,
                         completed,
                         acceptable,
                         new Date(last_mod.getTime()));