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 ec48beffd1b923de47e4e550f13df7bb68f94d48..1f63eb34f5094e2ba8bf4cbd346bd3f7d435bc2c 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 209467ee62ceb0ec3e2a0f39d796004ee04b843b..5686a34fab8bc2a195f3dc09fbb7a4b4261efd7e 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 02496848cf7d438179b7927c19babc6cfc0d119f..e12a97e53c322eff4254c7c80e5cab61152a7d13 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 f861b1dbafafb0357ebbb502d4d64b381b1e0a80..f7b0eb9f928e197c0a4d471bafab75066157b1ab 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 b9029967939212ab3add8e7b197034bc3e8ae5de..86f11f89cc0a0d67b4d93f25b7dbeb125743af63 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 c1aca047ac6b70b84548e017fde99596a5b41f00..ae0c4346e2810025579eec6aa47aa7f1dff95633 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 d0bf8ff553258561ab13a0df01533dde66ec21fc..8ba2baa8ad8b01411e3f4ad843bed7bd4d300b83 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 f685510ad262ee3f0c5f2e89e6c68f26e3dd2a80..f95267dfd25e4ca1dd43d73f51cf53d48d8b6803 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 9548de0e767baf016210985223a4b96622c5560c..7c42d67af52464fd9bb4a10e7a0f8ed77b2fd566 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