TEDEFO-5002 Add codelist dependencies and skip empty rules in graph

Author: rousso

src/main/java/eu/europa/ted/efx/model/dependencies/DependencyGraph.java

@@ -105,6 +105,7 @@ private ObjectNode serializeDependsOn(final TargetDependencies entry) {
       ruleNode.put("ruleId", rule.getRuleId());
       this.putIfNotEmpty("fields", this.toStringArray(rule.getFields()), ruleNode);
       this.putIfNotEmpty("nodes", this.toStringArray(rule.getNodes()), ruleNode);
+      this.putIfNotEmpty("codeLists", this.toStringArray(rule.getCodelists()), ruleNode);
       assertArray.add(ruleNode);
     }
     this.putIfNotEmpty("assert", assertArray, dependsOn);

src/main/java/eu/europa/ted/efx/model/dependencies/DependencySet.java

@@ -12,6 +12,7 @@ public class DependencySet {
 
   private final Set<String> fieldIds = new LinkedHashSet<>();
   private final Set<String> nodeIds = new LinkedHashSet<>();
+  private final Set<String> codelistNames = new LinkedHashSet<>();
 
   public void addField(final String fieldId) {
     this.fieldIds.add(fieldId);
@@ -21,6 +22,10 @@ public void addNode(final String nodeId) {
     this.nodeIds.add(nodeId);
   }
 
+  public void addCodelist(final String codelistName) {
+    this.codelistNames.add(codelistName);
+  }
+
   public void removeField(final String fieldId) {
     this.fieldIds.remove(fieldId);
   }
@@ -32,6 +37,7 @@ public void removeNode(final String nodeId) {
   public void addAll(final DependencySet other) {
     this.fieldIds.addAll(other.fieldIds);
     this.nodeIds.addAll(other.nodeIds);
+    this.codelistNames.addAll(other.codelistNames);
   }
 
   public Set<String> getFieldIds() {
@@ -42,14 +48,19 @@ public Set<String> getNodeIds() {
     return Collections.unmodifiableSet(this.nodeIds);
   }
 
+  public Set<String> getCodelistNames() {
+    return Collections.unmodifiableSet(this.codelistNames);
+  }
+
   public boolean isEmpty() {
-    return this.fieldIds.isEmpty() && this.nodeIds.isEmpty();
+    return this.fieldIds.isEmpty() && this.nodeIds.isEmpty() && this.codelistNames.isEmpty();
   }
 
   public Set<String> allIds() {
     final Set<String> result = new LinkedHashSet<>();
     result.addAll(this.fieldIds);
     result.addAll(this.nodeIds);
+    result.addAll(this.codelistNames);
     return Collections.unmodifiableSet(result);
   }
 }

src/main/java/eu/europa/ted/efx/model/dependencies/RuleDependency.java

@@ -12,11 +12,14 @@ public class RuleDependency {
   private final String ruleId;
   private final Set<String> fields;
   private final Set<String> nodes;
+  private final Set<String> codelists;
 
-  public RuleDependency(final String ruleId, final Set<String> fields, final Set<String> nodes) {
+  public RuleDependency(final String ruleId, final Set<String> fields, final Set<String> nodes,
+      final Set<String> codelists) {
     this.ruleId = ruleId;
     this.fields = Collections.unmodifiableSet(new LinkedHashSet<>(fields));
     this.nodes = Collections.unmodifiableSet(new LinkedHashSet<>(nodes));
+    this.codelists = Collections.unmodifiableSet(new LinkedHashSet<>(codelists));
   }
 
   public String getRuleId() {
@@ -30,4 +33,8 @@ public Set<String> getFields() {
   public Set<String> getNodes() {
     return this.nodes;
   }
+
+  public Set<String> getCodelists() {
+    return this.codelists;
+  }
 }

src/main/java/eu/europa/ted/efx/sdk2/EfxComputeDependencyExtractor.java

@@ -118,6 +118,11 @@ public void enterSimpleNodeReference(final SimpleNodeReferenceContext ctx) {
     this.stack.peek().addNode(ctx.NodeId().getText());
   }
 
+  @Override
+  public void enterCodelistReference(final CodelistReferenceContext ctx) {
+    this.stack.peek().addCodelist(ctx.codelistName.getText());
+  }
+
   // #endregion Listener methods
 
   protected void resolveAlias(final String alias) {

src/main/java/eu/europa/ted/efx/sdk2/EfxValidationDependencyExtractor.java

@@ -183,7 +183,7 @@ private void commitRule(final AsClauseContext asClause, final ForClauseContext f
         ? this.graph.getOrCreateFieldEntry(targetId)
         : this.graph.getOrCreateNodeEntry(targetId);
 
-    target.addAssertDependency(new RuleDependency(ruleId, ruleDeps.getFieldIds(), ruleDeps.getNodeIds()));
+    target.addAssertDependency(new RuleDependency(ruleId, ruleDeps.getFieldIds(), ruleDeps.getNodeIds(), ruleDeps.getCodelistNames()));
   }
 
   // #endregion Rule lifecycle

src/test/resources/eu/europa/ted/efx/sdk2/EfxValidationDependencyExtractorTest/testComprehensive/expected.json

@@ -68,24 +68,31 @@
       } ]
     }
   }, {
-    "id" : "BT-01-SubSubNode-Text",
+    "id" : "BT-00-Code",
+    "dependsOn" : {
+      "assert" : [ {
+        "ruleId" : "R-C02-003",
+        "nodes" : [ "ND-Root" ],
+        "codeLists" : [ "accessibility" ]
+      } ]
+    },
     "requiredBy" : {
       "assert" : {
-        "fields" : [ "BT-01-SubNode-Text" ]
+        "fields" : [ "BT-00-Text" ]
       }
     }
   }, {
-    "id" : "BT-00-Repeatable-Text",
+    "id" : "BT-01-SubSubNode-Text",
     "requiredBy" : {
       "assert" : {
-        "fields" : [ "BT-00-Number" ]
+        "fields" : [ "BT-01-SubNode-Text" ]
       }
     }
   }, {
-    "id" : "BT-00-Code",
+    "id" : "BT-00-Repeatable-Text",
     "requiredBy" : {
       "assert" : {
-        "fields" : [ "BT-00-Text" ]
+        "fields" : [ "BT-00-Number" ]
       }
     }
   }, {
@@ -135,7 +142,7 @@
     "id" : "ND-Root",
     "requiredBy" : {
       "assert" : {
-        "fields" : [ "BT-00-Number", "BT-00-Text", "BT-00-EndDate" ],
+        "fields" : [ "BT-00-Number", "BT-00-Text", "BT-00-EndDate", "BT-00-Code" ],
         "nodes" : [ "ND-RepeatableNode" ]
       }
     }

src/test/resources/eu/europa/ted/efx/sdk2/EfxValidationDependencyExtractorTest/testComprehensive/input.efx

@@ -50,3 +50,9 @@ WITH ND-Root
     ASSERT BT-00-StartDate is present and BT-00-EndDate is present and BT-00-StartDate <= BT-00-EndDate
     AS ERROR R-C02-002
     FOR BT-00-EndDate IN *
+
+// Rule 8: Codelist reference
+WITH ND-Root
+    ASSERT BT-00-Code in [...accessibility]
+    AS ERROR R-C02-003
+    FOR BT-00-Code IN *