Refine printJson to take modules in account when sorting elements

oracle · Jun 3, 2024 · 97c56cd · 97c56cd
1 parent 1f2a7c1
commit 97c56cd
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/...c/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java b/...c/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java
@@ -317,12 +317,13 @@ public void printJson(JsonWriter writer) throws IOException {
         if (!ignoredResources.isEmpty()) {
             writer.append(',').newline();
             writer.quote("excludes").append(':');
-            JsonPrinter.printCollection(writer, ignoredResources.keySet(), ConditionalElement.comparator(), ResourceConfiguration::conditionalIgnoredElementJson);
+            JsonPrinter.printCollection(writer, ignoredResources.keySet(), ConditionalElement.comparator(), ResourceConfiguration::conditionalRegexElementJson);
         }
         writer.unindent();
         writer.append('}').append(',').newline();
         writer.quote("globs").append(':');
-        JsonPrinter.printCollection(writer, addedGlobs, ConditionalElement.comparator(Comparator.comparing(ResourceEntry::pattern)), ResourceConfiguration::conditionalGlobElementJson);
+        JsonPrinter.printCollection(writer, addedGlobs, ConditionalElement.comparator(Comparator.comparing(ResourceEntry::pattern).thenComparing(ResourceEntry::module)),
+                        ResourceConfiguration::conditionalGlobElementJson);
         writer.append(',').newline();
         writer.quote("bundles").append(':');
         JsonPrinter.printCollection(writer, bundles.keySet(), ConditionalElement.comparator(), (p, w) -> printResourceBundle(bundles.get(p), w));
@@ -373,13 +374,6 @@ private static void conditionalRegexElementJson(ConditionalElement<String> p, Js
         w.unindent().newline().append('}');
     }
 
-    private static void conditionalIgnoredElementJson(ConditionalElement<String> p, JsonWriter w) throws IOException {
-        w.append('{').indent().newline();
-        ConfigurationConditionPrintable.printConditionAttribute(p.condition(), w);
-        w.quote("pattern").append(':').quote(p.element());
-        w.unindent().newline().append('}');
-    }
-
     public interface Predicate {
         boolean testIncludedResource(ConditionalElement<String> condition);