From 9b46c244c6e7afb1301124e63beb13465cbedcb8 Mon Sep 17 00:00:00 2001 From: Toni Rikkola Date: Mon, 16 Sep 2019 08:46:25 +0300 Subject: [PATCH] DROOLS-5203 : Make DMN Validator use generic V&V module for conflicting, misleading, masked and overlapping rows --- .../plugin/client/AnalyzerBuilder.java | 6 +++++ .../plugin/client/DTableUpdateManager.java | 2 ++ .../plugin/client/builders/ActionBuilder.java | 8 +----- .../client/builders/BuilderFactory.java | 1 - .../plugin/client/builders/CellBuilder.java | 4 +-- .../plugin/client/builders/ColumnBuilder.java | 7 +++++ .../client/builders/ConditionBuilder.java | 4 +-- .../builders/FieldConditionBuilder.java | 6 ++--- .../plugin/client/builders/FieldResolver.java | 26 ++++++++----------- .../plugin/client/builders/IndexBuilder.java | 4 ++- .../client/builders/PatternResolver.java | 5 ++-- .../plugin/client/builders/Utils.java | 5 ++-- .../testutil/AnalyzerConfigurationMock.java | 7 +++++ .../DecisionTableAnalyzerBuilder.java | 7 +++++ drools-wb-webapp/pom.xml | 1 - 15 files changed, 57 insertions(+), 36 deletions(-) diff --git a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java index ecc22da981f..101eba51780 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/AnalyzerBuilder.java @@ -16,7 +16,9 @@ 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; @@ -24,6 +26,8 @@ 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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/DTableUpdateManager.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/DTableUpdateManager.java index d49940b0691..bbde6770ae8 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/DTableUpdateManager.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ActionBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ActionBuilder.java index 211de9ecc1b..3de194545bc 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ActionBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/BuilderFactory.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/BuilderFactory.java index 1b4a76f8d22..c0d35f34f6a 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/BuilderFactory.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/CellBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/CellBuilder.java index 35ece603aa1..973f2de3b14 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/CellBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java index e2188b53ca6..61f49780251 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ColumnBuilder.java @@ -17,6 +17,7 @@ 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 { @@ -24,6 +25,7 @@ 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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ConditionBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ConditionBuilder.java index cfbdf669d2d..1687c200217 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/ConditionBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldConditionBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldConditionBuilder.java index 565c6f8e3a5..d0ccbe3fbb1 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldConditionBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldResolver.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldResolver.java index 64bd0caa33e..87edc4f680d 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/FieldResolver.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/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,14 +58,14 @@ 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), @@ -76,16 +73,15 @@ public Field resolveField(final Pattern pattern, 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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/IndexBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/IndexBuilder.java index 535ec86f0a2..31ca1f2dc8d 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/IndexBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/PatternResolver.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/PatternResolver.java index acc9c3ed32e..3ea80df1e88 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/PatternResolver.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/Utils.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/Utils.java index e0c6277b6e9..63f034bf38c 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/main/java/org/drools/workbench/services/verifier/plugin/client/builders/Utils.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/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 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-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/AnalyzerConfigurationMock.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/AnalyzerConfigurationMock.java index 084ff282d8a..6fcba3dff18 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/AnalyzerConfigurationMock.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/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/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/DecisionTableAnalyzerBuilder.java b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/DecisionTableAnalyzerBuilder.java index 59393722856..8c28ddf116e 100644 --- a/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/workbench/services/verifier/plugin/client/testutil/DecisionTableAnalyzerBuilder.java +++ b/drools-wb-services/drools-wb-verifier/drools-wb-verifier-guided-decision-table-adapter/src/test/java/org/drools/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 index 731a7a4f102..19f1a4360d1 100644 --- a/drools-wb-webapp/pom.xml +++ b/drools-wb-webapp/pom.xml @@ -670,7 +670,6 @@ org.drools drools-verifier-core - provided org.drools