diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/AbstractClassificationType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/AbstractClassificationType.java index 3657db50c1401f71decbb454415a34966af4c4db..923bfa55d064d2df49e696f4eb68ec7e9e61c482 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/AbstractClassificationType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/AbstractClassificationType.java @@ -6,18 +6,29 @@ import de.unikoblenz.fgbks.base.domain.Name; public abstract class AbstractClassificationType implements ClassificationType { protected Name name; + protected Name niceName; protected Description description; - protected AbstractClassificationType(Name name, Description description) { + protected AbstractClassificationType(Name name, Name niceName, Description description) { this.name = name; + this.niceName = niceName; this.description = description; } + protected AbstractClassificationType(Name name, Description description) { + this(name, new Name(name), description); + } + @Override public Name getName() { return name; } + @Override + public Name getNiceName() { + return niceName; + } + @Override public Description getDescription() { return description; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/ClassificationType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/ClassificationType.java index e4359deaeef5a4d2fe540b0f4ecc85369ef0e9e2..b70195a0b7b5ce2f5acabed76f8291d691967afd 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/ClassificationType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/ClassificationType.java @@ -12,6 +12,10 @@ public interface ClassificationType extends Serializable { @JsonbProperty("name") Name getName(); + @NotNull + @JsonbProperty("niceName") + Name getNiceName(); + @NotNull @JsonbProperty("description") Description getDescription(); diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DecisionLogicLevelVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DecisionLogicLevelVerification.java index a6e88e7a7b0590fae1c398551526b140999def66..f015e91f24f6449adfae1474c980f3d49c29eb30 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DecisionLogicLevelVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DecisionLogicLevelVerification.java @@ -10,7 +10,7 @@ public class DecisionLogicLevelVerification extends AbstractClassificationType { new DecisionLogicLevelVerification(); private DecisionLogicLevelVerification() { - super(new Name("DecisionLogic"), new Description("test")); // TODO + super(new Name("DecisionLogic"), new Name("Decision Logic"), new Description("test")); // TODO } public static DecisionLogicLevelVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DrdModelingLevelVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DrdModelingLevelVerification.java index 6de26519a2b797c7da11ef380ae6a4464ea08464..3feb19570b8d8cad8ef3e8f7efa77676d373b8ab 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DrdModelingLevelVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/classification/DrdModelingLevelVerification.java @@ -6,11 +6,10 @@ import de.unikoblenz.fgbks.base.domain.Name; @Classification public class DrdModelingLevelVerification extends AbstractClassificationType { - private static final DrdModelingLevelVerification instance = - new DrdModelingLevelVerification(); + private static final DrdModelingLevelVerification instance = new DrdModelingLevelVerification(); private DrdModelingLevelVerification() { - super(new Name("DrdModeling"), new Description("test")); // TODO + super(new Name("DrdModeling"), new Name("DRD Modeling"), new Description("test")); // TODO } public static DrdModelingLevelVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/AbstractVerificationType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/AbstractVerificationType.java index f81cf28f833dadc2d664222a13e79ac3c136114e..2c66966f9545ce76233cfed1f34655f23fbb4e52 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/AbstractVerificationType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/AbstractVerificationType.java @@ -7,18 +7,29 @@ import java.util.Objects; public abstract class AbstractVerificationType implements VerificationType { protected Name name; + protected Name niceName; protected Description description; - protected AbstractVerificationType(Name name, Description description) { + protected AbstractVerificationType(Name name, Name niceName, Description description) { this.name = name; + this.niceName = niceName; this.description = description; } + protected AbstractVerificationType(Name name, Description description) { + this(name, new Name(name), description); + } + @Override public Name getName() { return name; } + @Override + public Name getNiceName() { + return niceName; + } + @Override public Description getDescription() { return description; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/DateVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/DateVerification.java index 01f7b7bba5bcc4d6ac0f19e57da3932ce22351f2..64ea2417a3c1373bbff9487170f984cdf176a169 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/DateVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/DateVerification.java @@ -12,7 +12,10 @@ public class DateVerification extends AbstractVerificationType { private static final DateVerification instance = new DateVerification(); private DateVerification() { - super(new Name("DateFormatCheck"), new Description("test")); // TODO + super( + new Name("DateFormatVerification"), + new Name("Date Format Check"), + new Description("test")); // TODO } public static DateVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EmptyOutputVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EmptyOutputVerification.java index 5c7c7a14e3a796acfbf465f4bb4b13a80a038aef..842123728b944f2cbaecb3f9984b164b55fcff76 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EmptyOutputVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EmptyOutputVerification.java @@ -12,7 +12,10 @@ public class EmptyOutputVerification extends AbstractVerificationType { private static final EmptyOutputVerification instance = new EmptyOutputVerification(); private EmptyOutputVerification() { - super(new Name("EmptyOutputVerification"), new Description("test")); // TODO + super( + new Name("EmptyOutputVerification"), + new Name("Empty Output"), + new Description("test")); // TODO } public static EmptyOutputVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EquivalentStringVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EquivalentStringVerification.java index d6285899bd424bc2573cdf23464ff66aec5f12cc..90803b7eb3f5df8f87324ecbcace54910425a0aa 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EquivalentStringVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/EquivalentStringVerification.java @@ -12,7 +12,10 @@ public class EquivalentStringVerification extends AbstractVerificationType { private static final EquivalentStringVerification instance = new EquivalentStringVerification(); private EquivalentStringVerification() { - super(new Name("EquivalentStringVerification"), new Description("test")); // TODO + super( + new Name("EquivalentStringVerification"), + new Name("Equivalent Strings"), + new Description("test")); // TODO } public static EquivalentStringVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/IdenticalBusinessRuleVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/IdenticalBusinessRuleVerification.java index eb60d8e39b1e7afd49fb73f6d1a58fb3056759d3..749bd5b0dd06f77a8013876d58634f3b636f1602 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/IdenticalBusinessRuleVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/IdenticalBusinessRuleVerification.java @@ -13,7 +13,7 @@ public class IdenticalBusinessRuleVerification extends AbstractVerificationType new IdenticalBusinessRuleVerification(); private IdenticalBusinessRuleVerification() { - super(new Name("IdenticalBusinessRuleVerification"), new Description("test")); // TODO + super(new Name("Identical Rules"), new Description("test")); // TODO } public static IdenticalBusinessRuleVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/InputValueSyntaxVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/InputValueSyntaxVerification.java index da582ddef3368cf69fe5d155de30b3579f3aed12..a4112152d1eccbcd449a5f74c33cb77cfb8a4b9d 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/InputValueSyntaxVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/InputValueSyntaxVerification.java @@ -14,6 +14,7 @@ public class InputValueSyntaxVerification extends AbstractVerificationType { private InputValueSyntaxVerification() { super( new Name("InputValueSyntaxVerification"), + new Name("Input Value Syntax Check"), new Description("Check values for syntactical correctness.")); } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/LonelyDataInputVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/LonelyDataInputVerification.java index 201bfa5aef1e5354d907e2096ca0f81be6075d0e..f4a03689c663dc915cbbe823933090b2d83fff76 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/LonelyDataInputVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/LonelyDataInputVerification.java @@ -14,6 +14,7 @@ public class LonelyDataInputVerification extends AbstractVerificationType { private LonelyDataInputVerification() { super( new Name("LonelyDataInputVerification"), + new Name("Lonely Data Input"), new Description( "Checks for any input data node, if it has no connection to at least one decision table.")); } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputColumnVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputColumnVerification.java index 01a42585cf32705d3d038dff4c32474e3f298dd2..6a5ce32fc2d841bf68fd0c1d283b371edefff137 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputColumnVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputColumnVerification.java @@ -15,8 +15,8 @@ public class MissingInputColumnVerification extends AbstractVerificationType { private MissingInputColumnVerification() { super( new Name("MissingInputColumnVerification"), - new Description( - "todo")); // TODO englisch + new Name("Missing Input Column"), + new Description("todo")); // TODO } public static MissingInputColumnVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputDataVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputDataVerification.java index 1aea630323759b6d0877b853ee7f7679f05f3a44..64cdb7a1a13065a101ded20df616a3cd3652c205 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputDataVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingInputDataVerification.java @@ -15,8 +15,9 @@ public class MissingInputDataVerification extends AbstractVerificationType { private MissingInputDataVerification() { super( new Name("MissingInputDataVerification"), + new Name("Missing Input Data"), new Description( - "todo")); // TODO englisch + "todo")); // TODO } public static MissingInputDataVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingRuleVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingRuleVerification.java index 3fbcb580bb56bc6dbe1881cab2a6157289f1f465..7143891d88502d879f063fbcb2e2c6e2e862480f 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingRuleVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/MissingRuleVerification.java @@ -12,7 +12,10 @@ public class MissingRuleVerification extends AbstractVerificationType { private static final MissingRuleVerification instance = new MissingRuleVerification(); private MissingRuleVerification() { - super(new Name("MissingRuleVerification"), new Description("test")); // TODO + super( + new Name("MissingRuleVerification"), + new Name("Missing Rule"), + new Description("test")); // TODO } public static MissingRuleVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/OverlappingVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/OverlappingVerification.java index ccf21864b6c935bcaa6338ac3bcd89d06d7106d1..c46f899de87d925b17292dcde594811269f8a2b6 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/OverlappingVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/OverlappingVerification.java @@ -12,7 +12,10 @@ public class OverlappingVerification extends AbstractVerificationType { private static final OverlappingVerification instance = new OverlappingVerification(); private OverlappingVerification() { - super(new Name("OverlappingVerification"), new Description("test")); // TODO + super( + new Name("OverlappingVerification"), + new Name("Overlapping Rules"), + new Description("test")); // TODO } public static OverlappingVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PartialReductionVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PartialReductionVerification.java index f8d1476982396ad6c49f4c9027b418d1eae6f173..16f050f857f3d76a39d269ed56a0f2504c254222 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PartialReductionVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PartialReductionVerification.java @@ -12,7 +12,10 @@ public class PartialReductionVerification extends AbstractVerificationType { private static final PartialReductionVerification instance = new PartialReductionVerification(); private PartialReductionVerification() { - super(new Name("PartialReductionVerification"), new Description("test")); // TODO + super( + new Name("PartialReductionVerification"), + new Name("Partial Reductions"), + new Description("test")); // TODO } public static PartialReductionVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedExistingValueVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedExistingValueVerification.java index c15ae69f9f7d523f445fc9b22389a0c4d778f8f2..f8b941b013911ebf6dd8b95ae09160692849e855 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedExistingValueVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedExistingValueVerification.java @@ -14,6 +14,7 @@ public class PredefinedExistingValueVerification extends AbstractVerificationTyp private PredefinedExistingValueVerification() { super( new Name("PredefinedExistingValueVerification"), + new Name("Predefined Existing Values"), new Description( "Es gibt in einer Tabellen-Zelle einen String Value, der aber nicht in der Liste der " + "Predefines Values vorgesehen ist.")); // TODO englisch diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedMissingValueVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedMissingValueVerification.java index 5e1026be663aa41f95d6bff4944655c5e757d317..803cc04aee026f7324ce36099b448bf608a4c386 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedMissingValueVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/PredefinedMissingValueVerification.java @@ -15,6 +15,7 @@ public class PredefinedMissingValueVerification extends AbstractVerificationType private PredefinedMissingValueVerification() { super( new Name("PredefinedMissingValueVerification"), + new Name("Predefined Missing Values"), new Description( "Es gibt in einer Tabellen-Zelle predefines values, die jedoch nicht in der spalte vorhanden sind.")); // TODO englisch } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/SubsumptionVerification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/SubsumptionVerification.java index 5bd61e143163bdd88cc84c4ddbf2b61b96d21b6d..f62160003aa2cb23a8145fa58114a3f20c15416e 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/SubsumptionVerification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/SubsumptionVerification.java @@ -12,7 +12,10 @@ public class SubsumptionVerification extends AbstractVerificationType { private static final SubsumptionVerification instance = new SubsumptionVerification(); private SubsumptionVerification() { - super(new Name("SubsumptionVerification"), new Description("test")); // TODO + super( + new Name("SubsumptionVerification"), + new Name("Rule Subsumptions"), + new Description("test")); // TODO } public static SubsumptionVerification getInstance() { diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/VerificationType.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/VerificationType.java index b9a06e118bed98ee8c0ea0937b19b0fb92a7a779..795af33b7307ba4c097cc5c466dc81ec61184d59 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/VerificationType.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/types/VerificationType.java @@ -17,6 +17,10 @@ public interface VerificationType extends ValueObject { @JsonbProperty("name") Name getName(); + @NotNull + @JsonbProperty("niceName") + Name getNiceName(); + @NotNull @JsonbProperty("description") Description getDescription(); diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerificationResultSet..js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerificationResultSet..js index 6161d2df8908769ea025d88b54fc848cf54c0e9a..999e64ea7eec9d898389d7904dc33eb28af335d5 100644 --- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerificationResultSet..js +++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerificationResultSet..js @@ -55,6 +55,7 @@ * @type {object} * @property {string} description * @property {string} name + * @property {string} niceName * @property {VerificationClassification} classification */ @@ -63,4 +64,5 @@ * @type {object} * @property {string} description * @property {string} name + * * @property {string} niceName */