From 7dfbaecefddc68ae292c8ba8ac134ee53808d587 Mon Sep 17 00:00:00 2001 From: Jonas Blatt <jonasblatt@uni-koblenz.de> Date: Wed, 18 Sep 2019 10:20:26 +0200 Subject: [PATCH] move package --- .../utils/boundary/AbstractBoundary.java | 6 +++--- .../utils/boundary/AbstractGrowingBoundary.java | 10 +++++----- .../dmn => base}/utils/boundary/BoundType.java | 2 +- .../dmn => base}/utils/boundary/Boundary.java | 4 ++-- .../BoundaryOperationNotSupportedException.java | 2 +- .../utils/boundary/BoundaryParseException.java | 2 +- .../dmn => base}/utils/boundary/BoundaryUtils.java | 2 +- .../boundary/checker/AbstractBoundaryCheck.java | 5 +++++ .../base/utils/boundary/checker/BoundaryCheck.java | 10 ++++++++++ .../utils/boundary/checker/BoundaryCheckType.java | 2 +- .../utils/boundary/checker/CheckEqual.java | 4 ++-- .../utils/boundary/impl/BooleanBoundary.java | 8 ++++---- .../utils/boundary/impl/DateBoundary.java | 10 +++++----- .../utils/boundary/impl/DoubleBoundary.java | 10 +++++----- .../utils/boundary/impl/IntegerBoundary.java | 10 +++++----- .../utils/boundary/impl/LongBoundary.java | 10 +++++----- .../utils/boundary/impl/StringBoundary.java | 10 +++++----- .../fgbks/core/dmn/domain/vdmn/VDmnInputValue.java | 2 +- .../fgbks/core/dmn/domain/vdmn/VTypeRef.java | 14 +++++++------- .../dmn/domain/vdmn/impl/VDmnInputValueImpl.java | 2 +- .../boundary/checker/AbstractBoundaryCheck.java | 5 ----- .../dmn/utils/boundary/checker/BoundaryCheck.java | 10 ---------- .../verification/verifier/impl/DateVerifier.java | 4 ++-- .../verifier/impl/IdenticalVerifier.java | 2 +- 24 files changed, 73 insertions(+), 73 deletions(-) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/AbstractBoundary.java (89%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/AbstractGrowingBoundary.java (90%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/BoundType.java (81%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/Boundary.java (64%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/BoundaryOperationNotSupportedException.java (87%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/BoundaryParseException.java (83%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/BoundaryUtils.java (91%) create mode 100644 dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractBoundaryCheck.java create mode 100644 dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheck.java rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/checker/BoundaryCheckType.java (68%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/checker/CheckEqual.java (86%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/BooleanBoundary.java (76%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/DateBoundary.java (90%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/DoubleBoundary.java (85%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/IntegerBoundary.java (86%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/LongBoundary.java (86%) rename dmnverifierapi/src/main/java/de/unikoblenz/fgbks/{core/dmn => base}/utils/boundary/impl/StringBoundary.java (80%) delete mode 100644 dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/AbstractBoundaryCheck.java delete mode 100644 dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheck.java diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractBoundary.java similarity index 89% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractBoundary.java index 241f5b72..fd5e6c9f 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractBoundary.java @@ -1,8 +1,8 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheck; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheckType; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VTypeRef; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheck; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheckType; import java.util.HashMap; import org.apache.commons.lang3.Validate; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractGrowingBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractGrowingBoundary.java similarity index 90% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractGrowingBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractGrowingBoundary.java index c5d41646..768e7ab5 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/AbstractGrowingBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/AbstractGrowingBoundary.java @@ -1,10 +1,10 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheck; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheckType; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.CheckEqual; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheck; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheckType; +import de.unikoblenz.fgbks.base.utils.boundary.checker.CheckEqual; import java.util.HashMap; import java.util.Objects; import org.apache.commons.lang3.Validate; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundType.java similarity index 81% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundType.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundType.java index 4f22aca2..7f55b425 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundType.java @@ -1,4 +1,4 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; public enum BoundType { INCLUSIVE, diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/Boundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/Boundary.java similarity index 64% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/Boundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/Boundary.java index 43d073da..83460cfb 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/Boundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/Boundary.java @@ -1,7 +1,7 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheckType; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VTypeRef; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheckType; public interface Boundary extends Comparable<Boundary> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryOperationNotSupportedException.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryOperationNotSupportedException.java similarity index 87% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryOperationNotSupportedException.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryOperationNotSupportedException.java index c5aca2dd..11eb6fa9 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryOperationNotSupportedException.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryOperationNotSupportedException.java @@ -1,4 +1,4 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; public class BoundaryOperationNotSupportedException extends UnsupportedOperationException { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryParseException.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryParseException.java similarity index 83% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryParseException.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryParseException.java index 8e0b1852..911d3f65 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryParseException.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryParseException.java @@ -1,4 +1,4 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; public class BoundaryParseException extends RuntimeException { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryUtils.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryUtils.java similarity index 91% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryUtils.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryUtils.java index c557dc3d..ac02646f 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/BoundaryUtils.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/BoundaryUtils.java @@ -1,4 +1,4 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary; +package de.unikoblenz.fgbks.base.utils.boundary; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnValue; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractBoundaryCheck.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractBoundaryCheck.java new file mode 100644 index 00000000..4e1533ca --- /dev/null +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/AbstractBoundaryCheck.java @@ -0,0 +1,5 @@ +package de.unikoblenz.fgbks.base.utils.boundary.checker; + +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; + +public abstract class AbstractBoundaryCheck<T extends Boundary> implements BoundaryCheck<T> {} diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheck.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheck.java new file mode 100644 index 00000000..3ba0854d --- /dev/null +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheck.java @@ -0,0 +1,10 @@ +package de.unikoblenz.fgbks.base.utils.boundary.checker; + +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; + +public interface BoundaryCheck<T extends Boundary> { + + BoundaryCheckType getType(); + + boolean check(T b1, T b2); +} diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheckType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheckType.java similarity index 68% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheckType.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheckType.java index d1ddb80c..d6d849ab 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheckType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/BoundaryCheckType.java @@ -1,4 +1,4 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.checker; +package de.unikoblenz.fgbks.base.utils.boundary.checker; public enum BoundaryCheckType { IS_EQUAL, diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/CheckEqual.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckEqual.java similarity index 86% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/CheckEqual.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckEqual.java index d313a6b2..9dc1ed27 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/CheckEqual.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/checker/CheckEqual.java @@ -1,6 +1,6 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.checker; +package de.unikoblenz.fgbks.base.utils.boundary.checker; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; public class CheckEqual extends AbstractBoundaryCheck<AbstractGrowingBoundary> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/BooleanBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/BooleanBoundary.java similarity index 76% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/BooleanBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/BooleanBoundary.java index 171455c7..634f8674 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/BooleanBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/BooleanBoundary.java @@ -1,9 +1,9 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundaryParseException; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.BoundaryParseException; public class BooleanBoundary extends AbstractGrowingBoundary<Boolean> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DateBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DateBoundary.java similarity index 90% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DateBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DateBoundary.java index 9f87e55e..9075ea94 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DateBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DateBoundary.java @@ -1,10 +1,10 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.EXCLUSIVE; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.EXCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundaryParseException; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.BoundaryParseException; import java.time.LocalDateTime; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DoubleBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DoubleBoundary.java similarity index 85% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DoubleBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DoubleBoundary.java index b3cea405..7dfc6f21 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/DoubleBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/DoubleBoundary.java @@ -1,10 +1,10 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.EXCLUSIVE; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.EXCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundaryParseException; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.BoundaryParseException; import org.apache.commons.lang3.Validate; public class DoubleBoundary extends AbstractGrowingBoundary<Double> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/IntegerBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/IntegerBoundary.java similarity index 86% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/IntegerBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/IntegerBoundary.java index 3bab9a3f..18156bf2 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/IntegerBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/IntegerBoundary.java @@ -1,10 +1,10 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.EXCLUSIVE; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.EXCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundaryParseException; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.BoundaryParseException; import org.apache.commons.lang3.Validate; public class IntegerBoundary extends AbstractGrowingBoundary<Integer> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/LongBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/LongBoundary.java similarity index 86% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/LongBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/LongBoundary.java index 1f858062..f449c305 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/LongBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/LongBoundary.java @@ -1,10 +1,10 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.EXCLUSIVE; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundType.INCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.EXCLUSIVE; +import static de.unikoblenz.fgbks.base.utils.boundary.BoundType.INCLUSIVE; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractGrowingBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.BoundaryParseException; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractGrowingBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.BoundaryParseException; import org.apache.commons.lang3.Validate; public class LongBoundary extends AbstractGrowingBoundary<Long> { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/StringBoundary.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java similarity index 80% rename from dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/StringBoundary.java rename to dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java index 6e6654a4..84b4254a 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/impl/StringBoundary.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/boundary/impl/StringBoundary.java @@ -1,9 +1,9 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.impl; +package de.unikoblenz.fgbks.base.utils.boundary.impl; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.AbstractBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheck; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheckType; +import de.unikoblenz.fgbks.base.utils.boundary.AbstractBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheck; +import de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheckType; import java.util.Arrays; import java.util.HashMap; import java.util.Objects; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VDmnInputValue.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VDmnInputValue.java index cea579f2..03834434 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VDmnInputValue.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/VDmnInputValue.java @@ -1,7 +1,7 @@ package de.unikoblenz.fgbks.core.dmn.domain.vdmn; +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; import de.unikoblenz.fgbks.core.dmn.domain.ids.InputEntryId; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; public interface VDmnInputValue extends VDmnValue { 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 0fc14841..c01c662e 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 @@ -1,12 +1,12 @@ package de.unikoblenz.fgbks.core.dmn.domain.vdmn; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.BooleanBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.DateBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.DoubleBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.IntegerBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.LongBoundary; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.StringBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; +import de.unikoblenz.fgbks.base.utils.boundary.impl.BooleanBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.impl.DateBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.impl.DoubleBoundary; +import de.unikoblenz.fgbks.base.utils.boundary.impl.IntegerBoundary; +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; 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 56305f64..0d923df9 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 @@ -1,10 +1,10 @@ package de.unikoblenz.fgbks.core.dmn.domain.vdmn.impl; +import de.unikoblenz.fgbks.base.utils.boundary.Boundary; import de.unikoblenz.fgbks.core.dmn.domain.ids.InputEntryId; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnInputColumn; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnInputValue; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnRule; -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; import org.apache.commons.lang3.Validate; public class VDmnInputValueImpl extends VDmnValueImpl implements VDmnInputValue { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/AbstractBoundaryCheck.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/AbstractBoundaryCheck.java deleted file mode 100644 index 2550904d..00000000 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/AbstractBoundaryCheck.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.checker; - -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; - -public abstract class AbstractBoundaryCheck<T extends Boundary> implements BoundaryCheck<T> {} diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheck.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheck.java deleted file mode 100644 index 513d3698..00000000 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/utils/boundary/checker/BoundaryCheck.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.unikoblenz.fgbks.core.dmn.utils.boundary.checker; - -import de.unikoblenz.fgbks.core.dmn.utils.boundary.Boundary; - -public interface BoundaryCheck<T extends Boundary> { - - BoundaryCheckType getType(); - - boolean check(T b1, T b2); -} diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/DateVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/DateVerifier.java index 33decaed..7302a9c3 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/DateVerifier.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/DateVerifier.java @@ -1,7 +1,7 @@ package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.DateBoundary.dateGroupName; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.impl.DateBoundary.datePattern; +import static de.unikoblenz.fgbks.base.utils.boundary.impl.DateBoundary.dateGroupName; +import static de.unikoblenz.fgbks.base.utils.boundary.impl.DateBoundary.datePattern; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnColumn; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnValue; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/IdenticalVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/IdenticalVerifier.java index 1a5307ca..cf27710e 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/IdenticalVerifier.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/IdenticalVerifier.java @@ -1,6 +1,6 @@ package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl; -import static de.unikoblenz.fgbks.core.dmn.utils.boundary.checker.BoundaryCheckType.IS_EQUAL; +import static de.unikoblenz.fgbks.base.utils.boundary.checker.BoundaryCheckType.IS_EQUAL; import de.unikoblenz.fgbks.core.dmn.domain.ids.RuleId; import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnDecision; -- GitLab