From 0f2c9da8db83d296baf3c1a76c44af555744abe5 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Thu, 3 Oct 2019 14:09:39 +0200
Subject: [PATCH] getBoundaryFromText should return no optional
---
.../de/unikoblenz/fgbks/core/dmn/domain/vdmn/VTypeRef.java | 7 +++----
.../core/dmn/domain/vdmn/impl/VDmnInputValueImpl.java | 2 +-
.../base/utils/boundary/checker/AbstractCheckerTest.java | 2 +-
.../utils/boundary/checker/AbstractStringCheckerTest.java | 2 +-
.../utils/boundary/checker/CheckStringInContactTest.java | 2 +-
.../boundary/checker/CheckStringNotInContactTest.java | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VTypeRef.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VTypeRef.java
index 19198922..9852ee94 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VTypeRef.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VTypeRef.java
@@ -9,7 +9,6 @@ import de.unikoblenz.fgbks.base.utils.boundary.impl.InvalidBoundary;
import de.unikoblenz.fgbks.base.utils.boundary.impl.LongBoundary;
import de.unikoblenz.fgbks.base.utils.boundary.impl.StringBoundary;
import java.time.LocalDateTime;
-import java.util.Optional;
import org.camunda.bpm.model.dmn.instance.TypeRef;
/**
@@ -103,11 +102,11 @@ public enum VTypeRef {
* @param text the String to parse the new {@link Boundary}
* @return a Optional of a new {@link Boundary}
*/
- public Optional<Boundary> getBoundaryFromText(String text) {
+ public Boundary getBoundaryFromText(String text) {
try {
- return Optional.of(boundaryClass.getDeclaredConstructor(String.class).newInstance(text));
+ return boundaryClass.getDeclaredConstructor(String.class).newInstance(text);
} catch (Exception ignored) {
- return Optional.of(InvalidBoundary.getInstance());
+ return InvalidBoundary.getInstance();
}
}
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/impl/VDmnInputValueImpl.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/impl/VDmnInputValueImpl.java
index 30130748..9308d56d 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/impl/VDmnInputValueImpl.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/impl/VDmnInputValueImpl.java
@@ -73,7 +73,7 @@ public class VDmnInputValueImpl extends VDmnValueImpl implements VDmnInputValue
// create boundary, if not created before
if (value.boundary == null) {
value.boundary =
- value.dmnColumn.getTypeRef().getBoundaryFromText(value.getText()).orElse(null);
+ value.dmnColumn.getTypeRef().getBoundaryFromText(value.getText());
}
return super.build();
}
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractCheckerTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractCheckerTest.java
index 8e5b5ddb..b8c9aa9c 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractCheckerTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractCheckerTest.java
@@ -25,7 +25,7 @@ public abstract class AbstractCheckerTest {
}
private void doCheck(VTypeRef type, String b1, String b2, boolean expected) {
- doCheck(type.getBoundaryFromText(b1).get(), type.getBoundaryFromText(b2).get(), expected);
+ doCheck(type.getBoundaryFromText(b1), type.getBoundaryFromText(b2), expected);
}
private void doCheck(Boundary b1, Boundary b2, boolean expected) {
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractStringCheckerTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractStringCheckerTest.java
index 18cd2b2a..eeb8395e 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractStringCheckerTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractStringCheckerTest.java
@@ -19,7 +19,7 @@ public abstract class AbstractStringCheckerTest {
}
private void doCheck(VTypeRef type, String b1, String b2, boolean expected) {
- doCheck(type.getBoundaryFromText(b1).get(), type.getBoundaryFromText(b2).get(), expected);
+ doCheck(type.getBoundaryFromText(b1), type.getBoundaryFromText(b2), expected);
}
private void doCheck(Boundary b1, Boundary b2, boolean expected) {
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContactTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContactTest.java
index 0e4bddcd..60f81822 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContactTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringInContactTest.java
@@ -15,7 +15,7 @@ class CheckStringInContactTest extends AbstractStringCheckerTest {
doStringCheck("\"a\"", "not(\"b\")", true);
doStringCheck("\"a\"", "\"a\",\"b\"", true);
doStringCheck("\"a\"", "\"c\",\"b\"", false);
- doStringCheck("\"a\"", "not(\"a\",\"b\")", true);
+ doStringCheck("\"a\"", "not(\"a\",\"b\")", false);
doStringCheck("\"a\"", "not(\"c\",\"b\")", true);
doStringCheck("", "not(\"c\",\"b\")", true);
doStringCheck("", "\"c\",\"b\"", true);
diff --git a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringNotInContactTest.java b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringNotInContactTest.java
index 6d4e0e3c..07f94e5a 100644
--- a/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringNotInContactTest.java
+++ b/dmnverifierapi/src/test/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckStringNotInContactTest.java
@@ -15,7 +15,7 @@ class CheckStringNotInContactTest extends AbstractStringCheckerTest {
doStringCheck("\"a\"", "not(\"b\")", false);
doStringCheck("\"a\"", "\"a\",\"b\"", false);
doStringCheck("\"a\"", "\"c\",\"b\"", true);
- doStringCheck("\"a\"", "not(\"a\",\"b\")", false);
+ doStringCheck("\"a\"", "not(\"a\",\"b\")", true);
doStringCheck("\"a\"", "not(\"c\",\"b\")", false);
}
--
GitLab