Switching WG code to use object references.

4 files changed, 43 insertions, 19 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 b402173..b8ee03a 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
@@ -1,12 +1,18 @@
 package io.trygvis.rules.engine;
 
 import ch.qos.logback.core.util.FileUtil;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyName;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.introspect.Annotated;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import org.drools.core.common.DefaultFactHandle;
+import org.drools.core.factmodel.GeneratedFact;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.rule.FactHandle;
 
@@ -21,6 +27,8 @@ import java.util.function.Function;
 public class DbIo {
     private final ObjectMapper mapper;
 
+    private static final List<String> prioritizedKeys = List.of("key", "name", "fqdn");
+
     public DbIo(KieBase kieBase) {
         var factory = new YAMLFactory();
         factory.enable(YAMLGenerator.Feature.USE_NATIVE_TYPE_ID);
@@ -31,6 +39,29 @@ public class DbIo {
                 .withClassLoader(new AcmeClassLoader(kieBase));
         mapper.setTypeFactory(typeFactory);
         mapper.findAndRegisterModules();
+
+        mapper.setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
+            @Override
+            public ObjectIdInfo findObjectIdInfo(Annotated a) {
+                final Class<?> klass = a.getRawType();
+                if (GeneratedFact.class.isAssignableFrom(klass)) {
+                    System.out.println("klass = " + klass);
+
+                    for (String name : prioritizedKeys) {
+                        try {
+                            final String getter = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
+                            var f = klass.getMethod(getter);
+                            return new ObjectIdInfo(PropertyName.construct(name), null, ObjectIdGenerators.PropertyGenerator.class, null);
+                        } catch (NoSuchMethodException ignore) {
+                        }
+                    }
+                    System.out.println("a.getRawType() = " + klass);
+                    return new ObjectIdInfo(null, null, ObjectIdGenerators.IntSequenceGenerator.class, null);
+                }
+
+                return super.findObjectIdInfo(a);
+            }
+        });
     }
 
     public List<Object> load(String file) throws IOException {
@@ -86,8 +117,6 @@ public class DbIo {
 
         // TODO: check if klass is a Comparable directly.
 
-        var prioritizedKeys = List.of("key", "name", "fqdn");
-
         var discoveredFieldsP1 = new LinkedHashMap<String, Function<Object, Object>>();
         var discoveredFieldsP2 = new LinkedHashMap<String, Function<Object, Object>>();
 
@@ -228,18 +257,6 @@ public class DbIo {
             }
         }
 
-        /*
-        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();
@@ -282,12 +299,12 @@ 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");
+                "io.trygvis.rules",
+                "io.trygvis.rules.core");
 
         @Override
         public int compare(DbObject2 a, DbObject2 b) {
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/machine/Machine.java b/module/ri-engine/src/main/java/io/trygvis/rules/machine/Machine.java
index 8e54d60..34c17ca 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/machine/Machine.java
+++ b/module/ri-engine/src/main/java/io/trygvis/rules/machine/Machine.java
@@ -3,10 +3,11 @@ package io.trygvis.rules.machine;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
+@SuppressWarnings("unused")
 @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "name")
 public class Machine {
     public String name;
-    public String fqdn;
+    private String fqdn;
 
     public Machine() {
     }
@@ -22,4 +23,8 @@ public class Machine {
     public String getFqdn() {
         return fqdn;
     }
+
+    public void setFqdn(String fqdn) {
+        this.fqdn = fqdn;
+    }
 }
diff --git a/module/ri-engine/src/main/resources/io/trygvis/rules/dba/dba.drl b/module/ri-engine/src/main/resources/io/trygvis/rules/dba/dba.drl
index 9bdc0a5..0bee004 100644
--- a/module/ri-engine/src/main/resources/io/trygvis/rules/dba/dba.drl
+++ b/module/ri-engine/src/main/resources/io/trygvis/rules/dba/dba.drl
@@ -18,14 +18,14 @@ declare DbaMachineRole
     roles   : String[]
 end
 
-rule "Assign containers to hosts"
+rule "Assign containers to machine"
 when
     $machine : Machine()
     $machineRole : DbaMachineRole(machine == $machine.name)
     $container : Container(machine == null, $machineRole.roles contains machineRole)
 then
     System.out.println("Assigning container to machine: " + $machine.name);
-    modify($container) {
+    modify ($container) {
         machine = $machine
     }
 end
diff --git a/module/ri-engine/src/main/resources/io/trygvis/rules/terraform/terraform.drl b/module/ri-engine/src/main/resources/io/trygvis/rules/terraform/terraform.drl
index c1293fe..07a96e2 100644
--- a/module/ri-engine/src/main/resources/io/trygvis/rules/terraform/terraform.drl
+++ b/module/ri-engine/src/main/resources/io/trygvis/rules/terraform/terraform.drl
@@ -10,6 +10,8 @@ import java.util.Map;
 
 global io.trygvis.rules.engine.TemplateEngine te;
 
+dialect  "mvel"
+
 declare ScalewayMachine
     machine : Machine
     key : String