From 65893d0ddeb0e00dac3695c9cbe19436155a1611 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Sun, 13 Oct 2019 13:29:18 +0200
Subject: [PATCH] Fix empty names = no names
---
.../core/dmn/domain/vdmn/parser/SimpleVDmnParser.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/parser/SimpleVDmnParser.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/parser/SimpleVDmnParser.java
index 7ad51898..5010de2e 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/parser/SimpleVDmnParser.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/parser/SimpleVDmnParser.java
@@ -99,7 +99,7 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
VDmnDecisionImpl.Builder decisionBuilder = VDmnDecisionImpl.getBuilder().withDecisionId(id);
decisionBuilderMap.put(id, decisionBuilder);
// Add name, if present
- if (decision.getName() != null) {
+ if (decision.getName() != null && !decision.getName().isEmpty()) {
decisionBuilder.withName(decision.getName());
}
// Add DmnDecisionBuilder to definitionBuilder
@@ -132,11 +132,12 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
.withInputExpressionId(new InputExpressionId(inputCol.getInputExpression().getId()))
.withTypeRef(type);
// name
- if (inputCol.getInputExpression().getText() != null) {
+ if (inputCol.getInputExpression().getText() != null
+ && !inputCol.getInputExpression().getText().getTextContent().isEmpty()) {
builder.withName(inputCol.getInputExpression().getText().getTextContent());
}
// label
- if (inputCol.getLabel() != null) {
+ if (inputCol.getLabel() != null && !inputCol.getLabel().isEmpty()) {
builder.withLabel(inputCol.getLabel());
}
// Add Builder to builder list
@@ -162,11 +163,11 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
.withOutputId(new OutputId(outputCol.getId()))
.withTypeRef(VTypeRef.getTypeRefFromName(outputCol.getTypeRef()));
// name
- if (outputCol.getName() != null) {
+ if (outputCol.getName() != null && !outputCol.getName().isEmpty()) {
builder.withName(outputCol.getName());
}
// label
- if (outputCol.getLabel() != null) {
+ if (outputCol.getLabel() != null && !outputCol.getLabel().isEmpty()) {
builder.withLabel(outputCol.getLabel());
}
// Add Builder to builder list
--
GitLab