From b22433381d19b62b39291f1542933c7abfaee4b7 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Wed, 9 Oct 2019 10:18:19 +0200
Subject: [PATCH] Cleanup current verifier
---
.../core/dmn/verification/verifier/impl/DateVerifier.java | 6 +++---
.../dmn/verification/verifier/impl/EmptyOutputVerifier.java | 5 +----
.../dmn/verification/verifier/impl/EquivalentVerifier.java | 5 +----
.../dmn/verification/verifier/impl/IdenticalVerifier.java | 5 +----
.../verifier/impl/InputValueSyntaxVerifier.java | 5 +----
.../dmn/verification/verifier/impl/MissingRuleVerifier.java | 5 +----
.../dmn/verification/verifier/impl/OverlappingVerifier.java | 5 +----
.../verifier/impl/PartialReductionVerifier.java | 5 +----
.../dmn/verification/verifier/impl/SubsumptionVerifier.java | 5 +----
9 files changed, 11 insertions(+), 35 deletions(-)
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 ec48beff..1f63eb34 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
@@ -13,14 +13,13 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.DateVerification;
import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;
import java.util.List;
import java.util.regex.Matcher;
-@DmnVerifier(verifierType = DateVerification.class, verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = DateVerification.class)
public class DateVerifier extends AbstractVerifier {
@Override
@@ -42,7 +41,8 @@ public class DateVerifier extends AbstractVerifier {
if (!dateValue.getText().getValue().isEmpty()) {
String[] vals =
dateValue
- .getText().getValue()
+ .getText()
+ .getValue()
.replace('<', '\0')
.replace('>', '\0')
.replace('[', '\0')
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EmptyOutputVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EmptyOutputVerifier.java
index 209467ee..5686a34f 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EmptyOutputVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EmptyOutputVerifier.java
@@ -9,12 +9,9 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.EmptyOutputVerification;
-@DmnVerifier(
- verifierType = EmptyOutputVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = EmptyOutputVerification.class)
public class EmptyOutputVerifier extends AbstractVerifier {
@Override
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EquivalentVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EquivalentVerifier.java
index 02496848..e12a97e5 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EquivalentVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/EquivalentVerifier.java
@@ -14,15 +14,12 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.EquivalentStringVerification;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-@DmnVerifier(
- verifierType = EquivalentStringVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = EquivalentStringVerification.class)
public class EquivalentVerifier extends AbstractVerifier {
WordnetService wordnetService;
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 f861b1db..f7b0eb9f 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
@@ -14,16 +14,13 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.IdenticalBusinessRuleVerification;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
-@DmnVerifier(
- verifierType = IdenticalBusinessRuleVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = IdenticalBusinessRuleVerification.class)
public class IdenticalVerifier extends AbstractVerifier {
@Override
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/InputValueSyntaxVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/InputValueSyntaxVerifier.java
index b9029967..86f11f89 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/InputValueSyntaxVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/InputValueSyntaxVerifier.java
@@ -9,12 +9,9 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.InputValueSyntaxVerification;
-@DmnVerifier(
- verifierType = InputValueSyntaxVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = InputValueSyntaxVerification.class)
public class InputValueSyntaxVerifier extends AbstractVerifier {
@Override
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
index c1aca047..ae0c4346 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
@@ -20,7 +20,6 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.MissingRuleVerification;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -28,9 +27,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-@DmnVerifier(
- verifierType = MissingRuleVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = MissingRuleVerification.class)
public class MissingRuleVerifier extends AbstractVerifier {
public static final long INITIAL_ROW_NUMER = 9999L;
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/OverlappingVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/OverlappingVerifier.java
index d0bf8ff5..8ba2baa8 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/OverlappingVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/OverlappingVerifier.java
@@ -16,7 +16,6 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.OverlappingVerification;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +23,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
-@DmnVerifier(
- verifierType = OverlappingVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = OverlappingVerification.class)
public class OverlappingVerifier extends AbstractVerifier {
@Override
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/PartialReductionVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/PartialReductionVerifier.java
index f685510a..f95267df 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/PartialReductionVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/PartialReductionVerifier.java
@@ -14,14 +14,11 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.PartialReductionVerification;
import java.util.ArrayList;
import java.util.List;
-@DmnVerifier(
- verifierType = PartialReductionVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = PartialReductionVerification.class)
public class PartialReductionVerifier extends AbstractVerifier {
@Override
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/SubsumptionVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/SubsumptionVerifier.java
index 9548de0e..7c42d67a 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/SubsumptionVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/SubsumptionVerifier.java
@@ -15,16 +15,13 @@ import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntry.
import de.unikoblenz.fgbks.core.dmn.verification.result.VerificationResultEntryElement;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.AbstractVerifier;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.DmnVerifier;
-import de.unikoblenz.fgbks.core.dmn.verification.verifier.config.DefaultConfiguration;
import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.SubsumptionVerification;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-@DmnVerifier(
- verifierType = SubsumptionVerification.class,
- verifierConfig = DefaultConfiguration.class)
+@DmnVerifier(verifierType = SubsumptionVerification.class)
public class SubsumptionVerifier extends AbstractVerifier {
@Override
--
GitLab