diff --git a/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/Attribute.java b/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/Attribute.java new file mode 100644 index 00000000000..c72d8b818dd --- /dev/null +++ b/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/Attribute.java @@ -0,0 +1,68 @@ +/* + * Copyright 2019 Red Hat, Inc. and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package org.drools.workbench.models.datamodel.rule; + +import java.util.Objects; +import java.util.stream.Stream; + +import org.kie.soup.project.datamodel.oracle.DataType; + +/** + * This enum collects all attributes supported by kie tooling - guided rule editors, guided decision table editor ... + * The enum stores pairs (attribute name, attribute data type) + * The 'attribute data type' determines what HTML element will be shown for user to set the attribute value + * e.g. TYPE_BOOLEAN -> checkbox, TYPE_DATE -> date picker ... + */ +public enum Attribute { + SALIENCE("salience", DataType.TYPE_NUMERIC_INTEGER), + ENABLED("enabled", DataType.TYPE_BOOLEAN), + DATE_EFFECTIVE("date-effective", DataType.TYPE_DATE), + DATE_EXPIRES("date-expires", DataType.TYPE_DATE), + NO_LOOP("no-loop", DataType.TYPE_BOOLEAN), + AGENDA_GROUP("agenda-group", DataType.TYPE_STRING), + ACTIVATION_GROUP("activation-group", DataType.TYPE_STRING), + DURATION("duration", DataType.TYPE_NUMERIC_LONG), + TIMER("timer", DataType.TYPE_STRING), + CALENDARS("calendars", DataType.TYPE_STRING), + AUTO_FOCUS("auto-focus", DataType.TYPE_BOOLEAN), + LOCK_ON_ACTIVE("lock-on-active", DataType.TYPE_BOOLEAN), + RULEFLOW_GROUP("ruleflow-group", DataType.TYPE_STRING), + DIALECT("dialect", DataType.TYPE_STRING), + NEGATE_RULE("negate", DataType.TYPE_BOOLEAN); + + private final String attributeName; + + private final String dataType; + + Attribute(final String attributeName, final String dataType) { + this.attributeName = attributeName; + this.dataType = dataType; + } + + public String getAttributeName() { + return attributeName; + } + + public static String getAttributeDataType(final String name) { + return Stream.of(Attribute.values()) + .filter(a -> Objects.equals(a.getAttributeName(), name)) + .findFirst() + .map(a -> a.dataType) + .orElse(DataType.TYPE_STRING); + } + +} diff --git a/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/RuleAttribute.java b/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/RuleAttribute.java index e74eca82e19..1456513775e 100644 --- a/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/RuleAttribute.java +++ b/drools-workbench-models/drools-workbench-models-datamodel-api/src/main/java/org/drools/workbench/models/datamodel/rule/RuleAttribute.java @@ -16,20 +16,20 @@ package org.drools.workbench.models.datamodel.rule; +import static org.drools.workbench.models.datamodel.rule.Attribute.AUTO_FOCUS; +import static org.drools.workbench.models.datamodel.rule.Attribute.CALENDARS; +import static org.drools.workbench.models.datamodel.rule.Attribute.DURATION; +import static org.drools.workbench.models.datamodel.rule.Attribute.ENABLED; +import static org.drools.workbench.models.datamodel.rule.Attribute.LOCK_ON_ACTIVE; +import static org.drools.workbench.models.datamodel.rule.Attribute.NO_LOOP; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; +import static org.drools.workbench.models.datamodel.rule.Attribute.TIMER; + /** * This holds values for rule attributes (eg salience, agenda-group etc). */ public class RuleAttribute { - private static final String NOLOOP = "no-loop"; - private static final String SALIENCE = "salience"; - private static final String ENABLED = "enabled"; - private static final String DURATION = "duration"; - private static final String TIMER = "timer"; - private static final String LOCK_ON_ACTIVE = "lock-on-active"; - private static final String AUTO_FOCUS = "auto-focus"; - private static final String CALENDARS = "calendars"; - public RuleAttribute( final String name, final String value ) { this.attributeName = name; @@ -43,40 +43,36 @@ public RuleAttribute() { } public String toString() { - StringBuilder ret = new StringBuilder(); + final StringBuilder ret = new StringBuilder(); ret.append( this.attributeName ); - if ( NOLOOP.equals( attributeName ) ) { - ret.append( " " ); + ret.append( ' ' ); + if ( NO_LOOP.getAttributeName().equals( attributeName ) ) { ret.append( this.value == null ? "true" : this.value ); - } else if ( SALIENCE.equals( this.attributeName ) || - DURATION.equals( this.attributeName ) ) { - ret.append( " " ); + } else if ( SALIENCE.getAttributeName().equals( this.attributeName ) || + DURATION.getAttributeName().equals( this.attributeName ) ) { ret.append( this.value ); - } else if ( ENABLED.equals( this.attributeName ) || - AUTO_FOCUS.equals( this.attributeName ) || - LOCK_ON_ACTIVE.equals( this.attributeName ) ) { - ret.append( " " ); + } else if (ENABLED.getAttributeName().equals( this.attributeName ) || + AUTO_FOCUS.getAttributeName().equals( this.attributeName ) || + LOCK_ON_ACTIVE.getAttributeName().equals( this.attributeName ) ) { ret.append( this.value.equals( "true" ) ? "true" : "false" ); - } else if ( TIMER.equals( this.attributeName ) ) { - ret.append( " " ); + } else if (TIMER.getAttributeName().equals( this.attributeName ) ) { if ( this.value.startsWith( "(" ) && this.value.endsWith( ")" ) ) { ret.append( this.value ); } else { - ret.append( "(" ).append( this.value ).append( ")" ); + ret.append( '(' ).append( this.value ).append( ')' ); } - } else if ( CALENDARS.equals( this.attributeName ) ) { + } else if (CALENDARS.getAttributeName().equals( this.attributeName ) ) { final String raw = this.value.replaceAll( "\"|\\s", "" ); final String[] calendars = raw.split( "," ); - ret.append( " " ); for ( String calendar : calendars ) { - ret.append( "\"" ).append( calendar ).append( "\", " ); + ret.append( '"' ).append( calendar ).append( "\", " ); } ret.delete( ret.length() - 2, ret.length() ); } else if ( this.value != null ) { - ret.append( " \"" ); + ret.append( '"' ); ret.append( this.value ); - ret.append( "\"" ); + ret.append( '"' ); } return ret.toString(); } diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java index c131fbf6535..bd319aef40b 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import org.drools.workbench.models.datamodel.rule.ActionCallMethod; @@ -82,6 +83,8 @@ import org.kie.soup.project.datamodel.oracle.DataType; import org.kie.soup.project.datamodel.oracle.OperatorsOracle; +import static org.drools.workbench.models.datamodel.rule.Attribute.NEGATE_RULE; + /** * This takes care of converting GuidedDT object to DRL (via the RuleModel). */ @@ -884,7 +887,7 @@ void doAttribs(List allColumns, if (validateAttributeCell(cell)) { //If instance of "otherwise" column then flag RuleModel as being negated - if (at.getAttribute().equals(GuidedDecisionTable52.NEGATE_RULE_ATTR)) { + if (Objects.equals(at.getAttribute(), NEGATE_RULE.getAttributeName())) { rm.setNegated(Boolean.valueOf(cell)); } else { attribs.add(new RuleAttribute(at.getAttribute(), diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper1.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper1.java index af8418120e5..a07110dbbda 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper1.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper1.java @@ -15,6 +15,12 @@ */ package org.drools.workbench.models.guided.dtable.backend.util; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + 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.ActionRetractFactCol52; @@ -38,12 +44,6 @@ import org.kie.soup.project.datamodel.commons.IUpgradeHelper; import org.kie.soup.project.datamodel.oracle.DataType; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - /** * Helper class to upgrade model used for Guided Decision Table. This * implementation converts legacy GuidedDecisionTable objects to @@ -56,7 +56,6 @@ public class GuidedDecisionTableUpgradeHelper1 /** * Convert the legacy Decision Table model to the new - * * @param legacyDTModel * @return The new DTModel */ diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper2.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper2.java index 14bf4a69b9d..2044c6bb79e 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper2.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDecisionTableUpgradeHelper2.java @@ -15,13 +15,17 @@ */ package org.drools.workbench.models.guided.dtable.backend.util; +import java.util.List; +import java.util.Objects; + import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.BaseColumn; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; import org.kie.soup.project.datamodel.commons.IUpgradeHelper; -import java.util.List; +import static org.drools.workbench.models.datamodel.rule.Attribute.DURATION; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; /** * Helper class to upgrade data-types for Guided Decision Table. This @@ -34,7 +38,6 @@ public class GuidedDecisionTableUpgradeHelper2 /** * Convert the data-types in the Decision Table model - * * @param source * @return The new DTModel */ @@ -53,10 +56,10 @@ public GuidedDecisionTable52 upgrade(GuidedDecisionTable52 source) { final BaseColumn column = allColumns.get(iCol); if (column instanceof AttributeCol52) { AttributeCol52 attributeCol = (AttributeCol52) column; - final String attributeName = attributeCol.getAttribute(); - if (GuidedDecisionTable52.SALIENCE_ATTR.equals(attributeName)) { + final String attributeName = attributeCol.getAttribute(); + if (Objects.equals(SALIENCE.getAttributeName(), attributeName)) { iSalienceColumnIndex = iCol; - } else if (GuidedDecisionTable52.DURATION_ATTR.equals(attributeName)) { + } else if (Objects.equals(DURATION.getAttributeName(), attributeName)) { iDurationColumnIndex = iCol; } } diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/hitpolicy/DecisionTableHitPolicyEnhancer.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/hitpolicy/DecisionTableHitPolicyEnhancer.java index f64390c431f..5b2bf6ddffc 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/hitpolicy/DecisionTableHitPolicyEnhancer.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/hitpolicy/DecisionTableHitPolicyEnhancer.java @@ -23,6 +23,9 @@ import org.drools.workbench.models.guided.dtable.shared.model.MetadataCol52; import org.drools.workbench.models.guided.dtable.shared.validation.DecisionTableValidator; +import static org.drools.workbench.models.datamodel.rule.Attribute.ACTIVATION_GROUP; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; + /** * Validates and extends the model based on selected HitPolicy * @see org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52.HitPolicy @@ -107,7 +110,7 @@ private RowPriorityResolver getRowPriorityResolver( final int priorityColumnInde private int makeSalienceColumn() { final AttributeCol52 attributeCol = new AttributeCol52(); - attributeCol.setAttribute( "salience" ); + attributeCol.setAttribute( SALIENCE.getAttributeName() ); dtable.getAttributeCols() .add( attributeCol ); @@ -152,7 +155,7 @@ private int getRowNumberColumnIndex() { private void addActivationGroup( final String activationGroupType ) { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( GuidedDecisionTable52.ACTIVATION_GROUP_ATTR ); + attributeCol52.setAttribute( ACTIVATION_GROUP.getAttributeName() ); dtable.getAttributeCols() .add( attributeCol52 ); diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52.java index 9508f07961c..56b3e00b9c2 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52.java @@ -1,12 +1,12 @@ /* * Copyright 2011 Red Hat, Inc. and/or its affiliates. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/GuidedDecisionTable52.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/GuidedDecisionTable52.java index 1f0a1e8ec16..0b2c7bf5f29 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/GuidedDecisionTable52.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/GuidedDecisionTable52.java @@ -1,12 +1,12 @@ /* * Copyright 2011 Red Hat, Inc. and/or its affiliates. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -47,25 +47,6 @@ public class GuidedDecisionTable52 implements HasImports, */ public static final int INTERNAL_ELEMENTS = 2; - /** - * Various attribute names - */ - public static final String SALIENCE_ATTR = "salience"; - public static final String ENABLED_ATTR = "enabled"; - public static final String DATE_EFFECTIVE_ATTR = "date-effective"; - public static final String DATE_EXPIRES_ATTR = "date-expires"; - public static final String NO_LOOP_ATTR = "no-loop"; - public static final String AGENDA_GROUP_ATTR = "agenda-group"; - public static final String ACTIVATION_GROUP_ATTR = "activation-group"; - public static final String DURATION_ATTR = "duration"; - public static final String TIMER_ATTR = "timer"; - public static final String CALENDARS_ATTR = "calendars"; - public static final String AUTO_FOCUS_ATTR = "auto-focus"; - public static final String LOCK_ON_ACTIVE_ATTR = "lock-on-active"; - public static final String RULEFLOW_GROUP_ATTR = "ruleflow-group"; - public static final String DIALECT_ATTR = "dialect"; - public static final String NEGATE_RULE_ATTR = "negate"; - private String tableName; private String parentName; @@ -147,7 +128,6 @@ public List getAttributeCols() { /** * Return an immutable list of Pattern columns - * * @return */ public List getPatterns() { @@ -277,7 +257,6 @@ public List> getData() { * knowledge of individual columns is necessary; for example separate * columns in the user-interface or where individual columns need to be * analysed. - * * @return A List of individual columns */ public List getExpandedColumns() { @@ -399,7 +378,6 @@ public void setHitPolicy(final HitPolicy hitPolicy) { /** * Retrieve, or lazily instantiate a new, AuditLog. - * * @return */ public AuditLog getAuditLog() { diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/util/ColumnUtilitiesBase.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/util/ColumnUtilitiesBase.java index 57d34f71195..d2a7da00a9b 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/util/ColumnUtilitiesBase.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/util/ColumnUtilitiesBase.java @@ -15,6 +15,7 @@ */ package org.drools.workbench.models.guided.dtable.shared.util; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.datamodel.rule.BaseSingleFieldConstraint; import org.drools.workbench.models.datamodel.rule.DSLSentence; import org.drools.workbench.models.datamodel.rule.FactPattern; @@ -88,34 +89,7 @@ private String getType(final RowNumberCol52 col) { } private String getType(final AttributeCol52 col) { - String type = DataType.TYPE_STRING; - final String attrName = col.getAttribute(); - if (attrName.equals(GuidedDecisionTable52.SALIENCE_ATTR)) { - type = DataType.TYPE_NUMERIC_INTEGER; - } else if (attrName.equals(GuidedDecisionTable52.ENABLED_ATTR)) { - type = DataType.TYPE_BOOLEAN; - } else if (attrName.equals(GuidedDecisionTable52.NO_LOOP_ATTR)) { - type = DataType.TYPE_BOOLEAN; - } else if (attrName.equals(GuidedDecisionTable52.DURATION_ATTR)) { - type = DataType.TYPE_NUMERIC_LONG; - } else if (attrName.equals(GuidedDecisionTable52.TIMER_ATTR)) { - type = DataType.TYPE_STRING; - } else if (attrName.equals(GuidedDecisionTable52.CALENDARS_ATTR)) { - type = DataType.TYPE_STRING; - } else if (attrName.equals(GuidedDecisionTable52.AUTO_FOCUS_ATTR)) { - type = DataType.TYPE_BOOLEAN; - } else if (attrName.equals(GuidedDecisionTable52.LOCK_ON_ACTIVE_ATTR)) { - type = DataType.TYPE_BOOLEAN; - } else if (attrName.equals(GuidedDecisionTable52.DATE_EFFECTIVE_ATTR)) { - type = DataType.TYPE_DATE; - } else if (attrName.equals(GuidedDecisionTable52.DATE_EXPIRES_ATTR)) { - type = DataType.TYPE_DATE; - } else if (attrName.equals(GuidedDecisionTable52.DIALECT_ATTR)) { - type = DataType.TYPE_STRING; - } else if (attrName.equals(GuidedDecisionTable52.NEGATE_RULE_ATTR)) { - type = DataType.TYPE_BOOLEAN; - } - return type; + return Attribute.getAttributeDataType(col.getAttribute()); } private String getType(final ConditionCol52 col) { diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/validation/HitPolicyValidation.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/validation/HitPolicyValidation.java index ee35d35cea1..ced4de4f9be 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/validation/HitPolicyValidation.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/validation/HitPolicyValidation.java @@ -22,18 +22,21 @@ import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; +import static org.drools.workbench.models.datamodel.rule.Attribute.ACTIVATION_GROUP; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; + public class HitPolicyValidation { - public static Set getReservedAttributes( GuidedDecisionTable52.HitPolicy hitPolicy ) { + public static Set getReservedAttributes(GuidedDecisionTable52.HitPolicy hitPolicy ) { switch ( hitPolicy ) { case UNIQUE_HIT: - return new HashSet<>( Arrays.asList( GuidedDecisionTable52.ACTIVATION_GROUP_ATTR ) ); + return new HashSet<>( Arrays.asList( ACTIVATION_GROUP.getAttributeName() ) ); case FIRST_HIT: case RESOLVED_HIT: - return new HashSet<>( Arrays.asList( GuidedDecisionTable52.SALIENCE_ATTR, - GuidedDecisionTable52.ACTIVATION_GROUP_ATTR ) ); + return new HashSet<>( Arrays.asList( SALIENCE.getAttributeName(), + ACTIVATION_GROUP.getAttributeName() ) ); case RULE_ORDER: - return new HashSet<>( Arrays.asList( GuidedDecisionTable52.SALIENCE_ATTR ) ); + return new HashSet<>( Arrays.asList( SALIENCE.getAttributeName() ) ); case NONE: default: return Collections.EMPTY_SET; diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceFirstHitPolicyTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceFirstHitPolicyTest.java index caa14ac90a7..68f89f136ad 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceFirstHitPolicyTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceFirstHitPolicyTest.java @@ -16,6 +16,7 @@ package org.drools.workbench.models.guided.dtable.backend; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.backend.util.DataUtilities; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; @@ -23,7 +24,7 @@ import org.junit.Before; import org.junit.Test; -import static org.drools.workbench.models.guided.dtable.backend.TestUtil.*; +import static org.drools.workbench.models.guided.dtable.backend.TestUtil.assertContainsLinesInOrder; public class GuidedDTDRLPersistenceFirstHitPolicyTest { @@ -51,7 +52,7 @@ public void setUp() throws public void blockUseOfSalience() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "salience" ); + attributeCol52.setAttribute(Attribute.SALIENCE.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "123" ) ); dtable.getAttributeCols() @@ -65,7 +66,7 @@ public void blockUseOfSalience() { public void blockUseOfActivationGroup() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "activation-group" ); + attributeCol52.setAttribute(Attribute.ACTIVATION_GROUP.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "test" ) ); dtable.getAttributeCols() diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceResolvedHitPolicyTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceResolvedHitPolicyTest.java index 1a33ade85e5..5efd74bdd46 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceResolvedHitPolicyTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceResolvedHitPolicyTest.java @@ -19,6 +19,7 @@ import java.util.List; import org.drools.workbench.models.guided.dtable.backend.util.DataUtilities; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; @@ -54,7 +55,7 @@ public void setUp() throws public void blockUseOfSalience() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "salience" ); + attributeCol52.setAttribute(Attribute.SALIENCE.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "123" ) ); dtable.getAttributeCols() @@ -68,7 +69,7 @@ public void blockUseOfSalience() { public void blockUseOfActivationGroup() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "activation-group" ); + attributeCol52.setAttribute(Attribute.ACTIVATION_GROUP.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "test" ) ); dtable.getAttributeCols() diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceRuleOrderHitPolicyTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceRuleOrderHitPolicyTest.java index 3b4f5dcec99..50d146a8313 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceRuleOrderHitPolicyTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceRuleOrderHitPolicyTest.java @@ -16,15 +16,13 @@ package org.drools.workbench.models.guided.dtable.backend; -import org.drools.workbench.models.guided.dtable.backend.util.DataUtilities; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; import org.junit.Before; import org.junit.Test; -import static org.drools.workbench.models.guided.dtable.backend.TestUtil.*; - public class GuidedDTDRLPersistenceRuleOrderHitPolicyTest { @@ -43,7 +41,7 @@ public void setUp() throws public void blockUseOfSalience() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "salience" ); + attributeCol52.setAttribute(Attribute.SALIENCE.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "123" ) ); dtable.getAttributeCols() diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java index 7bd98a6b15e..80bad0ed417 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java @@ -51,6 +51,7 @@ import org.drools.workbench.models.guided.dtable.shared.model.ActionWorkItemCol52; import org.drools.workbench.models.guided.dtable.shared.model.ActionWorkItemInsertFactCol52; import org.drools.workbench.models.guided.dtable.shared.model.ActionWorkItemSetFieldCol52; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.BRLActionColumn; import org.drools.workbench.models.guided.dtable.shared.model.BRLActionVariableColumn; @@ -162,7 +163,7 @@ public void test2Rules() throws Exception { dt.setTableName("michael"); AttributeCol52 attr = new AttributeCol52(); - attr.setAttribute("salience"); + attr.setAttribute(Attribute.SALIENCE.getAttributeName()); attr.setDefaultValue(new DTCellValue52("66")); dt.getAttributeCols().add(attr); @@ -265,9 +266,9 @@ public void testAttribs() { rm.attributes); AttributeCol52 col1 = new AttributeCol52(); - col1.setAttribute("salience"); + col1.setAttribute(Attribute.SALIENCE.getAttributeName()); AttributeCol52 col2 = new AttributeCol52(); - col2.setAttribute("agenda-group"); + col2.setAttribute(Attribute.AGENDA_GROUP.getAttributeName()); attributeCols.add(col1); attributeCols.add(col2); allColumns.addAll(attributeCols); @@ -358,7 +359,7 @@ public void testInOperator() { dt.setTableName("michael"); AttributeCol52 attr = new AttributeCol52(); - attr.setAttribute("salience"); + attr.setAttribute(Attribute.SALIENCE.getAttributeName()); attr.setDefaultValue(new DTCellValue52("66")); dt.getAttributeCols().add(attr); @@ -435,7 +436,7 @@ public void testInterpolate() { dt.setTableName("michael"); AttributeCol52 attr = new AttributeCol52(); - attr.setAttribute("salience"); + attr.setAttribute(Attribute.SALIENCE.getAttributeName()); attr.setDefaultValue(new DTCellValue52("66")); dt.getAttributeCols().add(attr); @@ -2106,7 +2107,7 @@ public void testLimitedEntryAttributes() { dt.setTableName("limited-entry"); AttributeCol52 attr = new AttributeCol52(); - attr.setAttribute("salience"); + attr.setAttribute(Attribute.SALIENCE.getAttributeName()); dt.getAttributeCols().add(attr); dt.setData(DataUtilities.makeDataLists(new String[][]{ diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceUniqueHitPolicyTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceUniqueHitPolicyTest.java index 0c38c4e73b0..f8b9100c5fd 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceUniqueHitPolicyTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceUniqueHitPolicyTest.java @@ -17,6 +17,7 @@ package org.drools.workbench.models.guided.dtable.backend; import org.drools.workbench.models.guided.dtable.backend.util.DataUtilities; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; @@ -42,7 +43,7 @@ public void setUp() throws public void blockUseOfActivationGroup() { final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( "activation-group" ); + attributeCol52.setAttribute(Attribute.ACTIVATION_GROUP.getAttributeName()); attributeCol52.setDefaultValue( new DTCellValue52( "test" ) ); dtable.getAttributeCols() diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTModelConversionTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTModelConversionTest.java index 6dfbc388e27..3c14f646c2d 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTModelConversionTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTModelConversionTest.java @@ -20,6 +20,7 @@ import org.drools.workbench.models.guided.dtable.shared.model.ActionInsertFactCol52; import org.drools.workbench.models.guided.dtable.shared.model.ActionRetractFactCol52; import org.drools.workbench.models.guided.dtable.shared.model.ActionSetFieldCol52; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.DTCellValue52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; import org.drools.workbench.models.guided.dtable.shared.model.legacy.ActionInsertFactCol; @@ -143,7 +144,7 @@ public void testConversion() { assertEquals(1, tsdt.getAttributeCols().size()); - assertEquals("salience", + assertEquals(Attribute.SALIENCE.getAttributeName(), tsdt.getAttributeCols().get(0).getAttribute()); assertEquals("66", tsdt.getAttributeCols().get(0).getDefaultValue().getStringValue()); @@ -350,7 +351,7 @@ public void testConversionPatternGrouping() { assertEquals(1, tsdt.getAttributeCols().size()); - assertEquals("salience", + assertEquals(Attribute.SALIENCE.getAttributeName(), tsdt.getAttributeCols().get(0).getAttribute()); assertEquals("66", tsdt.getAttributeCols().get(0).getDefaultValue().getStringValue()); diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52Test.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52Test.java index 06fe42bd10d..735942726f3 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52Test.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52Test.java @@ -16,6 +16,14 @@ package org.drools.workbench.models.guided.dtable.shared.model; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import static org.drools.workbench.models.datamodel.rule.Attribute.ACTIVATION_GROUP; +import static org.drools.workbench.models.datamodel.rule.Attribute.ENABLED; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; import static org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52.FIELD_ATTRIBUTE; import static org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52.FIELD_REVERSE_ORDER; import static org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52.FIELD_USE_ROW_NUMBER; @@ -25,11 +33,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - public class AttributeCol52Test extends ColumnTestBase { private AttributeCol52 column1; @@ -38,7 +41,7 @@ public class AttributeCol52Test extends ColumnTestBase { @Before public void setup() { column1 = new AttributeCol52(); - column1.setAttribute("attr"); + column1.setAttribute(SALIENCE.getAttributeName()); column1.setReverseOrder(false); column1.setUseRowNumber(false); column1.setHeader("header"); @@ -46,7 +49,7 @@ public void setup() { column1.setDefaultValue(new DTCellValue52("default")); column2 = new AttributeCol52(); - column2.setAttribute("attr"); + column2.setAttribute(SALIENCE.getAttributeName()); column2.setReverseOrder(false); column2.setUseRowNumber(false); column2.setHeader("header"); @@ -61,10 +64,10 @@ public void testDiffEmpty() { @Test public void testDiffAttribute() { - column1.setAttribute("attr1"); - column2.setAttribute("attr2"); + column1.setAttribute(ACTIVATION_GROUP.getAttributeName()); + column2.setAttribute(ENABLED.getAttributeName()); - checkSingleDiff(FIELD_ATTRIBUTE, "attr1", "attr2", column1, column2); + checkSingleDiff(FIELD_ATTRIBUTE, ACTIVATION_GROUP.getAttributeName(), ENABLED.getAttributeName(), column1, column2); } @Test @@ -85,13 +88,13 @@ public void testDiffUseRowNumber() { @Test public void testDiffAll() { - column1.setAttribute("attr1"); + column1.setAttribute(SALIENCE.getAttributeName()); column1.setReverseOrder(false); column1.setUseRowNumber(false); column1.setHeader("header1"); column1.setHideColumn(false); column1.setDefaultValue(new DTCellValue52("default1")); - column2.setAttribute("attr2"); + column2.setAttribute(ACTIVATION_GROUP.getAttributeName()); column2.setReverseOrder(true); column2.setUseRowNumber(true); column2.setHeader("header2"); @@ -111,8 +114,8 @@ public void testDiffAll() { assertEquals("header1", diff.get(2).getOldValue()); assertEquals("header2", diff.get(2).getValue()); assertEquals(FIELD_ATTRIBUTE, diff.get(3).getFieldName()); - assertEquals("attr1", diff.get(3).getOldValue()); - assertEquals("attr2", diff.get(3).getValue()); + assertEquals(SALIENCE.getAttributeName(), diff.get(3).getOldValue()); + assertEquals(ACTIVATION_GROUP.getAttributeName(), diff.get(3).getValue()); assertEquals(FIELD_REVERSE_ORDER, diff.get(4).getFieldName()); assertEquals(false, diff.get(4).getOldValue()); assertEquals(true, diff.get(4).getValue()); diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorAttributesTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorAttributesTest.java index 1241e15842a..8a45be9853e 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorAttributesTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorAttributesTest.java @@ -16,17 +16,20 @@ package org.drools.workbench.models.guided.dtable.shared.validation; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.drools.workbench.models.datamodel.rule.Attribute; import org.drools.workbench.models.guided.dtable.shared.model.AttributeCol52; import org.drools.workbench.models.guided.dtable.shared.model.GuidedDecisionTable52; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @RunWith(Parameterized.class) public class DecisionTableValidatorAttributesTest { @@ -40,21 +43,7 @@ public DecisionTableValidatorAttributesTest( final String attributeName ) { @Parameterized.Parameters public static Collection attributes() { - return Arrays.asList( GuidedDecisionTable52.SALIENCE_ATTR, - GuidedDecisionTable52.ENABLED_ATTR, - GuidedDecisionTable52.DATE_EFFECTIVE_ATTR, - GuidedDecisionTable52.DATE_EXPIRES_ATTR, - GuidedDecisionTable52.NO_LOOP_ATTR, - GuidedDecisionTable52.AGENDA_GROUP_ATTR, - GuidedDecisionTable52.ACTIVATION_GROUP_ATTR, - GuidedDecisionTable52.DURATION_ATTR, - GuidedDecisionTable52.TIMER_ATTR, - GuidedDecisionTable52.CALENDARS_ATTR, - GuidedDecisionTable52.AUTO_FOCUS_ATTR, - GuidedDecisionTable52.LOCK_ON_ACTIVE_ATTR, - GuidedDecisionTable52.RULEFLOW_GROUP_ATTR, - GuidedDecisionTable52.DIALECT_ATTR, - GuidedDecisionTable52.NEGATE_RULE_ATTR ); + return Stream.of(Attribute.values()).map(Attribute::getAttributeName).collect(Collectors.toList()); } @Test(expected = DuplicateAttributeException.class) @@ -63,7 +52,7 @@ public void addAttributeColumn() throws final DecisionTableValidator validator = getDecisionTableValidator(); final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( attributeName ); + attributeCol52.setAttribute(attributeName); try { validator.isValidToAdd( attributeCol52 ); diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorHitPolicyAttributeLimitationsTest.java b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorHitPolicyAttributeLimitationsTest.java index 8c2bb1f6a54..899b5926aa7 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorHitPolicyAttributeLimitationsTest.java +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/shared/validation/DecisionTableValidatorHitPolicyAttributeLimitationsTest.java @@ -24,35 +24,38 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.drools.workbench.models.datamodel.rule.Attribute.ACTIVATION_GROUP; +import static org.drools.workbench.models.datamodel.rule.Attribute.SALIENCE; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @RunWith(Parameterized.class) public class DecisionTableValidatorHitPolicyAttributeLimitationsTest { private final GuidedDecisionTable52.HitPolicy hitPolicy; - private final String attributeName; + private final String attribute; private final boolean isAllowed; public DecisionTableValidatorHitPolicyAttributeLimitationsTest( final GuidedDecisionTable52.HitPolicy hitPolicy, - final String attributeName, + final String attribute, final boolean isAllowed ) { this.hitPolicy = hitPolicy; - this.attributeName = attributeName; + this.attribute = attribute; this.isAllowed = isAllowed; } @Parameterized.Parameters public static Collection attributes() { return Arrays.asList( new Object[][]{ - {GuidedDecisionTable52.HitPolicy.NONE, GuidedDecisionTable52.SALIENCE_ATTR, true}, - {GuidedDecisionTable52.HitPolicy.FIRST_HIT, GuidedDecisionTable52.SALIENCE_ATTR, false}, - {GuidedDecisionTable52.HitPolicy.RULE_ORDER, GuidedDecisionTable52.SALIENCE_ATTR, false}, - {GuidedDecisionTable52.HitPolicy.UNIQUE_HIT, GuidedDecisionTable52.SALIENCE_ATTR, true}, - {GuidedDecisionTable52.HitPolicy.NONE, GuidedDecisionTable52.ACTIVATION_GROUP_ATTR, true}, - {GuidedDecisionTable52.HitPolicy.FIRST_HIT, GuidedDecisionTable52.ACTIVATION_GROUP_ATTR, false}, - {GuidedDecisionTable52.HitPolicy.RULE_ORDER, GuidedDecisionTable52.ACTIVATION_GROUP_ATTR, true}, - {GuidedDecisionTable52.HitPolicy.UNIQUE_HIT, GuidedDecisionTable52.ACTIVATION_GROUP_ATTR, false} + {GuidedDecisionTable52.HitPolicy.NONE, SALIENCE.getAttributeName(), true}, + {GuidedDecisionTable52.HitPolicy.FIRST_HIT, SALIENCE.getAttributeName(), false}, + {GuidedDecisionTable52.HitPolicy.RULE_ORDER, SALIENCE.getAttributeName(), false}, + {GuidedDecisionTable52.HitPolicy.UNIQUE_HIT, SALIENCE.getAttributeName(), true}, + {GuidedDecisionTable52.HitPolicy.NONE, ACTIVATION_GROUP.getAttributeName(), true}, + {GuidedDecisionTable52.HitPolicy.FIRST_HIT, ACTIVATION_GROUP.getAttributeName(), false}, + {GuidedDecisionTable52.HitPolicy.RULE_ORDER, ACTIVATION_GROUP.getAttributeName(), true}, + {GuidedDecisionTable52.HitPolicy.UNIQUE_HIT, ACTIVATION_GROUP.getAttributeName(), false} } ); } @@ -64,7 +67,7 @@ public void addAttributeColumn() throws final DecisionTableValidator validator = new DecisionTableValidator( table ); final AttributeCol52 attributeCol52 = new AttributeCol52(); - attributeCol52.setAttribute( attributeName ); + attributeCol52.setAttribute( attribute ); boolean wasAllowed = true; try { diff --git a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/resources/org/drools/workbench/models/guided/dtable/backend/ExistingDecisionTable.xml b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/resources/org/drools/workbench/models/guided/dtable/backend/ExistingDecisionTable.xml index 8e57b805314..a23f9156505 100644 --- a/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/resources/org/drools/workbench/models/guided/dtable/backend/ExistingDecisionTable.xml +++ b/drools-workbench-models/drools-workbench-models-guided-dtable/src/test/resources/org/drools/workbench/models/guided/dtable/backend/ExistingDecisionTable.xml @@ -8,6 +8,7 @@ -1 + salience