Skip to content
Snippets Groups Projects
Commit 29668c96 authored by Jonas Blatt's avatar Jonas Blatt :ant:
Browse files

Fix methods after refactoring

parent a3bd853c
No related branches found
No related tags found
No related merge requests found
......@@ -33,9 +33,13 @@ public class IdenticalRuleVerifier extends AbstractVerifier {
}
private void checkDecisionTable(VDmnDecisionTable dmnDecisionTable) {
checkForIdenticalRules(
dmnDecisionTable, dmnDecisionTable.getVDmnInputColumns(), 0,
dmnDecisionTable.getVDmnRules());
if (dmnDecisionTable.getVDmnInputColumns().size() > 0) {
checkForIdenticalRules(
dmnDecisionTable,
dmnDecisionTable.getVDmnInputColumns(),
0,
dmnDecisionTable.getVDmnRules());
}
}
protected void checkForIdenticalRules(
......@@ -49,8 +53,7 @@ public class IdenticalRuleVerifier extends AbstractVerifier {
vreFactory.addVerificationFix(SHOW_RULES);
vreFactory.addToEntry(
VerificationClassification.WARNING,
templateDecision(dmnDecisionTable.getVDmnDecision())
+ "Rules %s have identical inputs.",
templateDecision(dmnDecisionTable.getVDmnDecision()) + "Rules %s have identical inputs.",
getRulesRowsStrings(currentRules));
} else {
List<VDmnInputValue> curInVals = new ArrayList<>();
......
......@@ -49,26 +49,26 @@ public class MissingRuleVerifier extends AbstractVerifier {
}
private void findMissingRules(VDmnDecisionTable dmnDecisionTable) {
List<VDmnInputColumn> inputs = dmnDecisionTable.getInputColumns();
List<VDmnInputColumn> inputs = dmnDecisionTable.getVDmnInputColumns();
if (inputs.size() > 0) {
List<VDmnRuleChangeableImpl> missingRules =
checkForMissingRules(inputs, dmnDecisionTable.getRules());
checkForMissingRules(inputs, dmnDecisionTable.getVDmnRules());
// add errors for missing intervals
for (VDmnRule missingRule : missingRules) {
StringBuilder sb = new StringBuilder();
sb.append(templateDecision(dmnDecisionTable.getDmnDecision()));
sb.append(templateDecision(dmnDecisionTable.getVDmnDecision()));
sb.append("The following rule is not defined: { ");
sb.append(
missingRule.getDmnInputValues().stream()
missingRule.getVDmnInputValues().stream()
.map(v -> v.getBoundary().getParsedText())
.map(s -> s.isEmpty() ? "-" : s)
.collect(Collectors.joining(" / ")));
sb.append(" }");
Action.Builder fixActionBuilder =
Action.getBuilder().withActionScope(ActionScope.RULE).withActionType(ActionType.CREATE);
for (VDmnInputValue v : missingRule.getDmnInputValues()) {
for (VDmnInputValue v : missingRule.getVDmnInputValues()) {
fixActionBuilder.addValue(
v.getDmnInputColumn().getInputId().getValue(), v.getBoundary().getParsedText());
v.getVDmnInputColumn().getInputId().getValue(), v.getBoundary().getParsedText());
}
vreFactory
.addVerificationFix(VerificationFix.SHOW_DECISION)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment