1 files changed, 68 insertions, 9 deletions

diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java b/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
index 3173109..b402173 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
+++ b/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
@@ -189,6 +189,9 @@ public class DbIo {
         return comparator;
     }
 
+    static record DbObject2(String type, Object data) {
+    }
+
     public void dump(String s, Collection<FactHandle> factHandles, Function<Object, Boolean> filter) throws IOException {
         var yamlFile = new File("out", s + ".yaml");
 
@@ -214,18 +217,35 @@ public class DbIo {
             }
         }
 
+        var objects = new ArrayList<DbObject2>(facts.size());
+        for (var e : facts.entrySet()) {
+            var name = e.getKey().getName();
+
+            var collection = e.getValue();
+            collection.sort();
+            for (var fact : collection.values) {
+                objects.add(new DbObject2(name, fact));
+            }
+        }
+
+        /*
+        var x = new ArrayList<DbObject2>();
+        x.add(new DbObject2("io.trygvis.rules.dba.Container", null));
+        x.add(new DbObject2("io.trygvis.rules.machine.Machine", null));
+        x.add(new DbObject2("io.trygvis.acme.apps.AcmeMyApp", null));
+
+        System.out.println("xxxxxx");
+        x.sort(new DbObjectComparator());
+        x.forEach(System.out::println);
+        System.out.println("xxxxxx");
+        */
+
+        objects.sort(new DbObjectComparator());
+
         var factory = mapper.getFactory();
         try (var writer = new FileWriter(yamlFile);
              var g = factory.createGenerator(writer)) {
-            for (var e : facts.entrySet()) {
-                var name = e.getKey().getName();
-
-                var collection = e.getValue();
-                collection.sort();
-                for (var fact : collection.values) {
-                    g.writeObject(new DbObject(name, mapper.valueToTree(fact)));
-                }
-            }
+            g.writeObject(objects);
         }
     }
 
@@ -259,4 +279,43 @@ public class DbIo {
             }
         }
     }
+
+    private static class DbObjectComparator implements Comparator<DbObject2> {
+        private final List<String> prioritizedPackages = List.of(
+                "io.trygvis.rules.core",
+                "io.trygvis.rules.machine",
+                "io.trygvis.rules.network",
+                "io.trygvis.rules.dns",
+                "io.trygvis.rules.dba",
+                "io.trygvis.rules");
+
+        @Override
+        public int compare(DbObject2 a, DbObject2 b) {
+            var indexA = a.type.lastIndexOf(".");
+            String packageA = indexA == -1 ? null : a.type.substring(0, indexA);
+            String classA = indexA == -1 ? a.type : a.type.substring(indexA + 1);
+
+            var indexB = b.type.lastIndexOf(".");
+            String packageB = indexB == -1 ? null : b.type.substring(0, indexB);
+            String classB = indexB == -1 ? b.type : b.type.substring(indexB + 1);
+
+            var priIdxA = prioritizedPackages.indexOf(packageA);
+            var priIdxB = prioritizedPackages.indexOf(packageB);
+
+            if (priIdxA == -1 && priIdxB == -1) {
+                return classB.compareTo(classA);
+            } else if (priIdxA == -1) {
+                return 1;
+            } else if (priIdxB == -1) {
+                return -1;
+            }
+            return priIdxA - priIdxB;
+//            var diff = priIdxB - priIdxA;
+//            if (diff != 0) {
+//                return diff;
+//            }
+//
+//            return classB.compareTo(classA);
+        }
+    }
 }