Feat: add required node labels

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>org.molgenis</groupId>
     <artifactId>vip-decision-tree</artifactId>
-    <version>4.1.4</version>
+    <version>5.0.0</version>
 
     <name>vip-decision-tree</name>
     <description>Decision tree module for filtering and labelling VCF files</description>

src/main/java/org/molgenis/vcf/decisiontree/filter/model/BoolMultiNode.java

@@ -14,6 +14,7 @@ public class BoolMultiNode implements DecisionNode {
 
   @NonNull NodeType nodeType = NodeType.DECISION;
   @NonNull String id;
+  @NonNull String label;
   String description;
 
   @NonNull DecisionType decisionType = DecisionType.BOOL_MULTI;

src/main/java/org/molgenis/vcf/decisiontree/filter/model/BoolNode.java

@@ -15,6 +15,7 @@ public class BoolNode implements DecisionNode {
 
   @NonNull NodeType nodeType = NodeType.DECISION;
   @NonNull String id;
+  @NonNull String label;
   String description;
 
   @NonNull DecisionType decisionType = DecisionType.BOOL;

src/main/java/org/molgenis/vcf/decisiontree/filter/model/CategoricalNode.java

@@ -14,6 +14,7 @@ public class CategoricalNode implements DecisionNode {
 
   @NonNull DecisionType decisionType = DecisionType.CATEGORICAL;
   @NonNull String id;
+  @NonNull String label;
   String description;
 
   @NonNull NodeType nodeType = NodeType.DECISION;

src/main/java/org/molgenis/vcf/decisiontree/filter/model/ExistsNode.java

@@ -13,6 +13,7 @@ public class ExistsNode implements DecisionNode {
 
   @NonNull NodeType nodeType = NodeType.DECISION;
   @NonNull String id;
+  @NonNull String label;
   @NonNull Field field;
   String description;
 

src/main/java/org/molgenis/vcf/decisiontree/filter/model/LeafNode.java

@@ -11,6 +11,7 @@
 public class LeafNode implements Node {
   @NonNull NodeType nodeType = NodeType.LEAF;
   @NonNull String id;
+  @NonNull String label;
   String description;
 
   @NonNull String clazz;

src/main/java/org/molgenis/vcf/decisiontree/filter/model/Node.java

@@ -6,4 +6,6 @@ public interface Node {
   String getId();
 
   String getDescription();
+
+  String getLabel();
 }

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigBoolMultiNode.java

@@ -24,6 +24,7 @@ public class ConfigBoolMultiNode implements ConfigNode {
 
   @NonNull NodeType nodeType = NodeType.DECISION;
   @NonNull String id;
+  @NonNull String label;
 
   @NonNull DecisionType decisionType = DecisionType.BOOL;
   @NonNull List<String> fields;

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigBoolNode.java

@@ -15,6 +15,7 @@ public class ConfigBoolNode implements ConfigNode {
   @NonNull Type type = Type.BOOL;
 
   String description;
+  @NonNull String label;
   @NonNull ConfigBoolQuery query;
   @NonNull ConfigNodeOutcome outcomeTrue;
   @NonNull ConfigNodeOutcome outcomeFalse;

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigCategoricalNode.java

@@ -15,6 +15,7 @@
 public class ConfigCategoricalNode implements ConfigNode {
   @NonNull Type type = Type.CATEGORICAL;
   String description;
+  @NonNull String label;
 
   @NonNull String field;
   @NonNull Map<String, ConfigNodeOutcome> outcomeMap;

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigExistsNode.java

@@ -16,6 +16,7 @@ public class ConfigExistsNode implements ConfigNode {
   @NonNull Type type = Type.EXISTS;
   @NonNull String field;
   String description;
+  @NonNull String label;
   @NonNull ConfigNodeOutcome outcomeTrue;
   @NonNull ConfigNodeOutcome outcomeFalse;
 }

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigLeafNode.java

@@ -1,6 +1,7 @@
 package org.molgenis.vcf.decisiontree.loader.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,6 +17,7 @@ public class ConfigLeafNode implements ConfigNode {
   @NonNull Type type = Type.LEAF;
 
   String description;
+  @NonNull String label;
 
   @JsonProperty("class")
   String clazz;

src/main/java/org/molgenis/vcf/decisiontree/loader/model/ConfigNode.java

@@ -17,4 +17,7 @@ enum Type {
 
   @JsonPropertyDescription
   String getDescription();
+
+  @JsonPropertyDescription
+  String getLabel();
 }

src/main/java/org/molgenis/vcf/decisiontree/runner/DecisionTreeFactoryImpl.java

@@ -158,6 +158,7 @@ private Node toExistsNode(VcfMetadata vcfMetadata, String id, ConfigExistsNode c
     Field field = vcfMetadata.getField(configNode.getField());
     return ExistsNode.builder()
         .id(id)
+        .label(configNode.getLabel())
         .field(field)
         .description(configNode.getDescription())
         .build();
@@ -168,6 +169,7 @@ private BoolNode toBoolNode(VcfMetadata vcfMetadata, String id, ConfigBoolNode n
     BoolQuery boolQuery = toBoolQuery(vcfMetadata, nodeConfig.getQuery(), files);
     return BoolNode.builder()
         .id(id)
+        .label(nodeConfig.getLabel())
         .description(nodeConfig.getDescription())
         .query(boolQuery)
         .build();
@@ -198,6 +200,7 @@ private BoolMultiNode toBoolMultiNode(VcfMetadata vcfMetadata, String id,
         .toList();
     return BoolMultiNode.builder()
         .id(id)
+        .label(nodeConfig.getLabel())
         .fields(fields)
         .description(nodeConfig.getDescription())
         .clauses(boolMultiQueries)
@@ -286,6 +289,7 @@ private CategoricalNode toCategoricalNode(
     queryValidator.validateCategoricalNode(field);
     return CategoricalNode.builder()
         .id(id)
+        .label(nodeConfig.getLabel())
         .description(nodeConfig.getDescription())
         .field(field)
         .build();
@@ -294,6 +298,7 @@ private CategoricalNode toCategoricalNode(
   private LeafNode toLeafNode(String id, ConfigLeafNode nodeConfig) {
     return LeafNode.builder()
         .id(id)
+        .label(nodeConfig.getLabel())
         .description(nodeConfig.getDescription())
         .clazz(nodeConfig.getClazz())
         .build();

src/test/java/org/molgenis/vcf/decisiontree/filter/BoolMultiNodeEvaluatorTest.java

@@ -57,6 +57,7 @@ void evaluate() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1, field2))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -100,6 +101,7 @@ void evaluateClause1True() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1, field2))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -144,6 +146,7 @@ void evaluateFalse() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1, field2))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -187,6 +190,7 @@ void evaluateMissing() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1, field2))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -222,6 +226,7 @@ void evaluateOr() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1, field2))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -253,6 +258,7 @@ void evaluateSingleQuery() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -283,6 +289,7 @@ void evaluateSingleQueryMissingValue() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)
@@ -312,6 +319,7 @@ void evaluateSingleQueryMissingField() {
     BoolMultiNode node =
         BoolMultiNode.builder()
             .id("bool_node")
+            .label("bool_node")
             .fields(List.of(field1))
             .clauses(clauses)
             .outcomeDefault(outcomeDefault)