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

Fix methods after refactoring

parent 20a7523a
No related branches found
No related tags found
No related merge requests found
......@@ -29,16 +29,16 @@ public class MissingInputColumnVerifier extends AbstractVerifier {
@Override
protected void doVerification() {
// 1. check for input data nodes
for (VDmnInputData inputData : dmnObjectContainer.getVDmnDefinition().getDmnInputData()) {
for (VDmnInputData inputData : dmnObjectContainer.getVDmnDefinition().getVDmnInputData()) {
if (inputData.getName().isPresent()) {
List<Name> inputDataNames = Collections.singletonList(inputData.getName().get());
checkInputData(inputData, inputDataNames);
}
}
// 2. check for decision nodes
for (VDmnDecision decision : dmnObjectContainer.getVDmnDefinition().getDmnDecisions()) {
for (VDmnDecision decision : dmnObjectContainer.getVDmnDefinition().getVDmnDecisions()) {
List<Name> inputDataNames =
decision.getDmnDecisionTable().getOutputColumns().stream()
decision.getVDmnDecisionTable().getVDmnOutputColumns().stream()
.map(c -> c.getName().orElse(null))
.filter(Objects::nonNull)
.collect(Collectors.toList());
......@@ -52,7 +52,7 @@ public class MissingInputColumnVerifier extends AbstractVerifier {
for (VDmnDecision decision : inputDataNode.getInformationProvidingDecisions()) {
// Check all input columns of the decision node
List<Name> inputColumnNames =
decision.getDmnDecisionTable().getInputColumns().stream()
decision.getVDmnDecisionTable().getVDmnInputColumns().stream()
.map(x -> x.getName().orElse(null))
.filter(Objects::nonNull)
.collect(Collectors.toList());
......@@ -99,7 +99,7 @@ public class MissingInputColumnVerifier extends AbstractVerifier {
.build());
} else {
for (VDmnOutputColumn outputColumn :
((VDmnDecision) inputDataNode).getDmnDecisionTable().getOutputColumns()) {
((VDmnDecision) inputDataNode).getVDmnDecisionTable().getVDmnOutputColumns()) {
if (outputColumn.getName().isPresent()) {
vreFactory.addVerificationFix(
VerificationFix.getBuilder()
......
......@@ -25,11 +25,11 @@ public class MissingInputDataVerifier extends AbstractVerifier {
@Override
protected void doVerification() {
for (VDmnDecision decision : dmnObjectContainer.getVDmnDefinition().getDmnDecisions()) {
List<VDmnNode> inputNodes = decision.getDmnInformationRequirements();
for (VDmnDecision decision : dmnObjectContainer.getVDmnDefinition().getVDmnDecisions()) {
List<VDmnNode> inputNodes = decision.getVDmnInformationRequirements();
// Check for each input column if there is one input data node or one output column from a
// decision node
for (VDmnInputColumn inputColumn : decision.getDmnDecisionTable().getInputColumns()) {
for (VDmnInputColumn inputColumn : decision.getVDmnDecisionTable().getVDmnInputColumns()) {
checkExistingInputData(inputColumn, inputNodes);
}
}
......@@ -50,7 +50,8 @@ public class MissingInputDataVerifier extends AbstractVerifier {
VDmnDecision decision = (VDmnDecision) node;
// check for each output column, if the name of the output column matches the input column
// name
for (VDmnOutputColumn outputColumn : decision.getDmnDecisionTable().getOutputColumns()) {
for (VDmnOutputColumn outputColumn :
decision.getVDmnDecisionTable().getVDmnOutputColumns()) {
if (outputColumn.getName().isPresent()
&& outputColumn.getName().get().equals(inputColumnName)) {
return;
......@@ -88,7 +89,7 @@ public class MissingInputDataVerifier extends AbstractVerifier {
.build());
vreFactory.addToEntry(
VerificationClassification.WARNING,
templateDecision(inputColumn.getDmnDecision())
templateDecision(inputColumn.getVDmnDecision())
+ "Input column \"%s\" has no input data node.",
getColumnStringName(inputColumn));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment