kiegroup · Rikkola · Sep 16, 2019
diff --git a/...r/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java b/...r/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java
@@ -16,14 +16,18 @@
 
 package org.drools.workbench.services.verifier.plugin.client;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
 import org.drools.verifier.core.checks.base.CheckRunner;
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
 import org.drools.verifier.core.configuration.DateTimeFormatProvider;
 import org.drools.verifier.core.index.Index;
 import org.drools.verifier.core.index.keys.UUIDKeyProvider;
+import org.drools.verifier.core.index.model.Action;
+import org.drools.verifier.core.index.model.Condition;
 import org.drools.verifier.core.main.Analyzer;
 import org.drools.verifier.core.main.Reporter;
 import org.drools.workbench.services.verifier.plugin.client.api.DrlInitialize;
@@ -98,6 +102,8 @@ protected String newUUID() {
                     },
                     CheckConfigurationProvider.get(initialize.getModel()
                                                            .getHitPolicy()),
+                    new HashSet<>(Arrays.asList(Condition.keyDefinitions())),
+                    new HashSet<>(Arrays.asList(Action.keyDefinitions())),
                     checkRunner);
         }
         return configuration;

diff --git a/...c/main/java/org/drools/workbench/services/verifier/plugin/client/DTableUpdateManager.java b/...c/main/java/org/drools/workbench/services/verifier/plugin/client/DTableUpdateManager.java
@@ -22,6 +22,7 @@
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
 import org.drools.verifier.core.index.Index;
 import org.drools.verifier.core.index.model.Column;
+import org.drools.verifier.core.index.model.ColumnType;
 import org.drools.verifier.core.index.model.Rule;
 import org.drools.verifier.core.main.Analyzer;
 import org.drools.verifier.core.util.PortablePreconditions;
@@ -136,6 +137,7 @@ public void newColumn(final GuidedDecisionTable52 model,
         final Column column = builderFactory
                 .getColumnBuilder()
                 .with(columnIndex)
+                .with(ColumnType.LHS)
                 .build();
 
         analyzer.newColumn(column);

diff --git a/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/ActionBuilder.java b/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/ActionBuilder.java
@@ -151,11 +151,6 @@ public Action build() throws
     private Action addInsertFactAction(final ActionInsertFactCol52 actionCol) throws
             BuildException {
 
-        builderFactory.getPatternResolver()
-                .with(rule)
-                .with(columnIndex)
-                .resolve();
-
         return addAction(actionCol,
                          row.get(columnIndex));
     }
@@ -189,8 +184,7 @@ private Action addAction(final ActionCol52 actionCol,
         return action;
     }
 
-    private Field resolveField(final ActionCol52 actionCol) throws
-            BuildException {
+    private Field resolveField(final ActionCol52 actionCol) {
         return builderFactory.getFieldResolver()
                 .with(rule)
                 .with(actionCol)

diff --git a/...in/java/org/drools/workbench/services/verifier/plugin/client/builders/BuilderFactory.java b/...in/java/org/drools/workbench/services/verifier/plugin/client/builders/BuilderFactory.java
@@ -89,7 +89,6 @@ public PatternResolver getPatternResolver() {
 
     public FieldResolver getFieldResolver() {
         return new FieldResolver(this,
-                                 headerMetaData,
                                  configuration);
     }
 

diff --git a/.../main/java/org/drools/workbench/services/verifier/plugin/client/builders/CellBuilder.java b/.../main/java/org/drools/workbench/services/verifier/plugin/client/builders/CellBuilder.java
@@ -19,8 +19,8 @@
 
 import org.drools.verifier.core.index.model.Action;
 import org.drools.verifier.core.index.model.Condition;
-import org.drools.verifier.core.index.model.Pattern;
 import org.drools.verifier.core.index.model.Rule;
+import org.drools.verifier.core.index.model.meta.ConditionMaster;
 import org.drools.workbench.models.guided.dtable.shared.model.ActionCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.BRLConditionVariableColumn;
 import org.drools.workbench.models.guided.dtable.shared.model.BaseColumn;
@@ -82,7 +82,7 @@ public void build() throws
         }
     }
 
-    private Pattern resolvePattern(final Rule rule) {
+    private ConditionMaster resolvePattern(final Rule rule) {
         return builderFactory.getPatternResolver()
                 .with(rule)
                 .with(columnIndex)

diff --git a/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java b/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java
@@ -17,13 +17,15 @@
 
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
 import org.drools.verifier.core.index.model.Column;
+import org.drools.verifier.core.index.model.ColumnType;
 import org.kie.soup.commons.validation.PortablePreconditions;
 
 public class ColumnBuilder {
 
     private final AnalyzerConfiguration configuration;
 
     private int columnIndex;
+    private ColumnType columnType;
 
     public ColumnBuilder(final AnalyzerConfiguration configuration) {
         this.configuration = PortablePreconditions.checkNotNull("configuration",
@@ -32,9 +34,14 @@ public ColumnBuilder(final AnalyzerConfiguration configuration) {
 
     public Column build() {
         return new Column(columnIndex,
+                          columnType,
                           configuration);
     }
 
+    public ColumnBuilder with(final ColumnType columnType) {
+        this.columnType = columnType;
+        return this;
+    }
     public ColumnBuilder with(final int columnIndex) {
         this.columnIndex = columnIndex;
         return this;

diff --git a/.../java/org/drools/workbench/services/verifier/plugin/client/builders/ConditionBuilder.java b/.../java/org/drools/workbench/services/verifier/plugin/client/builders/ConditionBuilder.java
@@ -19,8 +19,8 @@
 import java.util.List;
 
 import org.drools.verifier.core.index.model.Condition;
-import org.drools.verifier.core.index.model.Pattern;
 import org.drools.verifier.core.index.model.Rule;
+import org.drools.verifier.core.index.model.meta.ConditionMaster;
 import org.drools.workbench.models.guided.dtable.shared.model.BRLConditionVariableColumn;
 import org.drools.workbench.models.guided.dtable.shared.model.ConditionCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52;
@@ -83,7 +83,7 @@ public Condition build() throws
             PortablePreconditions.checkNotNull("rule",
                                                rule);
 
-            final Pattern pattern = builderFactory.getPatternResolver()
+            final ConditionMaster pattern = builderFactory.getPatternResolver()
                     .with(rule)
                     .with(columnIndex)
                     .resolve();

diff --git a/.../org/drools/workbench/services/verifier/plugin/client/builders/FieldConditionBuilder.java b/.../org/drools/workbench/services/verifier/plugin/client/builders/FieldConditionBuilder.java
@@ -24,7 +24,7 @@
 import org.drools.verifier.core.index.model.Condition;
 import org.drools.verifier.core.index.model.Field;
 import org.drools.verifier.core.index.model.FieldCondition;
-import org.drools.verifier.core.index.model.Pattern;
+import org.drools.verifier.core.index.model.meta.ConditionMaster;
 import org.drools.workbench.models.guided.dtable.shared.model.ConditionCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52;
 import org.drools.workbench.services.verifier.plugin.client.util.NullEqualityOperator;
@@ -36,7 +36,7 @@ public class FieldConditionBuilder {
     private final Index index;
     private final VerifierColumnUtilities utils;
     private final AnalyzerConfiguration configuration;
-    private Pattern pattern;
+    private ConditionMaster pattern;
     private ConditionCol52 conditionCol52;
     private DTCellValue52 realCellValue;
     private int columnIndex;
@@ -160,7 +160,7 @@ private Column getColumn() throws
         }
     }
 
-    public FieldConditionBuilder with(final Pattern pattern) {
+    public FieldConditionBuilder with(final ConditionMaster pattern) {
         this.pattern = pattern;
         return this;
     }

diff --git a/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldResolver.java b/...ain/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldResolver.java
@@ -20,36 +20,33 @@
 import org.drools.verifier.core.index.model.Field;
 import org.drools.verifier.core.index.model.Pattern;
 import org.drools.verifier.core.index.model.Rule;
+import org.drools.verifier.core.index.model.meta.ConditionMaster;
+import org.drools.verifier.core.index.model.meta.ConditionParent;
 import org.drools.workbench.models.guided.dtable.shared.model.ActionCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.ActionInsertFactCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.ActionSetFieldCol52;
 import org.drools.workbench.models.guided.dtable.shared.model.BaseColumn;
 import org.drools.workbench.models.guided.dtable.shared.model.ConditionCol52;
-import org.drools.workbench.services.verifier.plugin.client.api.HeaderMetaData;
 import org.kie.soup.commons.validation.PortablePreconditions;
 
 public class FieldResolver {
 
     private final BuilderFactory builderFactory;
-    private final HeaderMetaData headerMetaData;
     private final AnalyzerConfiguration configuration;
     private BaseColumn baseColumn;
     private Rule rule;
-    private Pattern pattern;
+    private ConditionMaster pattern;
     private int columnIndex;
 
     public FieldResolver(final BuilderFactory builderFactory,
-                         final HeaderMetaData headerMetaData,
                          final AnalyzerConfiguration configuration) {
         this.builderFactory = PortablePreconditions.checkNotNull("builderFactory",
                                                                  builderFactory);
-        this.headerMetaData = PortablePreconditions.checkNotNull("headerMetaData",
-                                                                 headerMetaData);
         this.configuration = PortablePreconditions.checkNotNull("configuration",
                                                                 configuration);
     }
 
-    public Field resolveField(final Pattern pattern,
+    public Field resolveField(final ConditionMaster pattern,
                               final String fieldType,
                               final String factField,
                               final AnalyzerConfiguration configuration) {
@@ -61,31 +58,30 @@ public Field resolveField(final Pattern pattern,
         PortablePreconditions.checkNotNull("factField",
                                            factField);
 
-        final Field first = pattern.getFields()
+        final ConditionParent first = pattern.getConditionParents()
                 .where(Field.name()
                                .is(factField))
                 .select()
                 .first();
 
         if (first == null) {
-            final Field field = new Field(Utils.resolveObjectField(pattern.getObjectType(),
+            final Field field = new Field(Utils.resolveObjectField(((Pattern) pattern).getObjectType(),
                                                                    fieldType,
                                                                    factField,
                                                                    configuration),
                                           pattern.getName(),
                                           fieldType,
                                           factField,
                                           configuration);
-            pattern.getFields()
+            pattern.getConditionParents()
                     .add(field);
             return field;
         } else {
-            return first;
+            return (Field) first;
         }
     }
 
-    public Field resolve() throws
-            BuildException {
+    public Field resolve() {
         if (rule != null) {
             return resolveField(getPattern(),
                                 getType(),
@@ -99,7 +95,7 @@ public Field resolve() throws
         }
     }
 
-    private Pattern getPattern() {
+    private ConditionMaster getPattern() {
         if (pattern != null) {
             return pattern;
         } else {
@@ -153,7 +149,7 @@ public FieldResolver with(final Rule rule) {
         return this;
     }
 
-    public FieldResolver with(final Pattern pattern) {
+    public FieldResolver with(final ConditionMaster pattern) {
         this.pattern = pattern;
         return this;
     }

diff --git a/...main/java/org/drools/workbench/services/verifier/plugin/client/builders/IndexBuilder.java b/...main/java/org/drools/workbench/services/verifier/plugin/client/builders/IndexBuilder.java
@@ -18,6 +18,7 @@
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
 import org.drools.verifier.core.index.Index;
 import org.drools.verifier.core.index.IndexImpl;
+import org.drools.verifier.core.index.model.ColumnType;
 import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52;
 import org.drools.workbench.services.verifier.plugin.client.api.HeaderMetaData;
 import org.kie.soup.commons.validation.PortablePreconditions;
@@ -32,7 +33,7 @@ public IndexBuilder(final GuidedDecisionTable52 model,
                         final HeaderMetaData headerMetaData,
                         final VerifierColumnUtilities utils,
                         final AnalyzerConfiguration configuration) {
-        this.index = new IndexImpl();
+        this.index = new IndexImpl(configuration);
 
         this.model = PortablePreconditions.checkNotNull("model",
                                                         model);
@@ -59,6 +60,7 @@ private void buildColumns() {
             this.index.getColumns()
                     .add(builderFactory.getColumnBuilder()
                                  .with(columnIndex)
+                                 .with(ColumnType.UNKNOWN)
                                  .build());
         }
     }

diff --git a/...n/java/org/drools/workbench/services/verifier/plugin/client/builders/PatternResolver.java b/...n/java/org/drools/workbench/services/verifier/plugin/client/builders/PatternResolver.java
@@ -21,6 +21,7 @@
 import org.drools.verifier.core.index.model.ObjectType;
 import org.drools.verifier.core.index.model.Pattern;
 import org.drools.verifier.core.index.model.Rule;
+import org.drools.verifier.core.index.model.meta.ConditionMaster;
 import org.drools.workbench.services.verifier.plugin.client.api.HeaderMetaData;
 import org.kie.soup.commons.validation.PortablePreconditions;
 
@@ -62,12 +63,12 @@ private ObjectType resolveObjectType(final String factType) {
         }
     }
 
-    public Pattern resolve() {
+    public ConditionMaster resolve() {
 
         PortablePreconditions.checkNotNull("rule",
                                            rule);
 
-        final Pattern pattern = rule.getPatterns()
+        final ConditionMaster pattern = rule.getPatterns()
                 .where(Pattern.boundName()
                                .is(getBoundName()))
                 .select()

diff --git a/...er/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/Utils.java b/...er/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/Utils.java
@@ -23,6 +23,7 @@
 import org.drools.verifier.core.index.model.Field;
 import org.drools.verifier.core.index.model.ObjectField;
 import org.drools.verifier.core.index.model.ObjectType;
+import org.drools.verifier.core.index.model.meta.ConditionParentType;
 import org.drools.verifier.core.relations.Operator;
 import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52;
 import org.drools.workbench.models.guided.dtable.shared.model.DTColumnConfig52;
@@ -44,11 +45,11 @@ public static Optional<String> findOperatorFromCell(final DTCellValue52 realCell
         return Optional.empty();
     }
 
-    public static ObjectField resolveObjectField(final ObjectType objectType,
+    public static ConditionParentType resolveObjectField(final ObjectType objectType,
                                                  final String fieldType,
                                                  final String factField,
                                                  final AnalyzerConfiguration configuration) {
-        final ObjectField first = objectType.getFields()
+        final ConditionParentType first = objectType.getFields()
                 .where(Field.name()
                                .is(factField))
                 .select()

diff --git a/.../drools/workbench/services/verifier/plugin/client/testutil/AnalyzerConfigurationMock.java b/.../drools/workbench/services/verifier/plugin/client/testutil/AnalyzerConfigurationMock.java
@@ -15,8 +15,13 @@
  */
 package org.drools.workbench.services.verifier.plugin.client.testutil;
 
+import java.util.Arrays;
+import java.util.HashSet;
+
 import org.drools.verifier.core.checks.base.JavaCheckRunner;
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
+import org.drools.verifier.core.index.model.Action;
+import org.drools.verifier.core.index.model.Condition;
 import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52;
 import org.drools.workbench.services.verifier.plugin.client.CheckConfigurationProvider;
 
@@ -32,6 +37,8 @@ public AnalyzerConfigurationMock(GuidedDecisionTable52.HitPolicy hitPolicy) {
               new DateTimeFormatProviderMock(),
               new UUIDKeyProviderMock(),
               CheckConfigurationProvider.get(hitPolicy),
+              new HashSet<>(Arrays.asList(Condition.keyDefinitions())),
+              new HashSet<>(Arrays.asList(Action.keyDefinitions())),
               new JavaCheckRunner());
     }
 }
diff --git a/...ools/workbench/services/verifier/plugin/client/testutil/DecisionTableAnalyzerBuilder.java b/...ools/workbench/services/verifier/plugin/client/testutil/DecisionTableAnalyzerBuilder.java
@@ -16,9 +16,14 @@
 
 package org.drools.workbench.services.verifier.plugin.client.testutil;
 
+import java.util.Arrays;
+import java.util.HashSet;
+
 import org.drools.verifier.core.configuration.AnalyzerConfiguration;
 import org.drools.verifier.core.configuration.CheckConfiguration;
 import org.drools.verifier.core.index.Index;
+import org.drools.verifier.core.index.model.Action;
+import org.drools.verifier.core.index.model.Condition;
 import org.drools.verifier.core.main.Analyzer;
 import org.drools.verifier.core.main.Reporter;
 import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52;
@@ -66,6 +71,8 @@ protected InnerBuilder getInnerBuilder() {
                 new DateTimeFormatProviderMock(),
                 new UUIDKeyProviderMock(),
                 CheckConfiguration.newDefault(),
+                new HashSet<>(Arrays.asList(Condition.keyDefinitions())),
+                new HashSet<>(Arrays.asList(Action.keyDefinitions())),
                 new GWTCheckRunner()));
     }
 

diff --git a/drools-wb-webapp/pom.xml b/drools-wb-webapp/pom.xml
@@ -670,7 +670,6 @@
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-verifier-core</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>