Skip to content
Snippets Groups Projects
Commit 580f227d authored by Jonas Blatt's avatar Jonas Blatt :ant:
Browse files

Merge branch 'feat/verifier' into feat/dmnapp/purehtmljs

parents 6fa0bbda fe86d5a1
No related branches found
No related tags found
No related merge requests found
Showing
with 72 additions and 17 deletions
...@@ -6,18 +6,29 @@ import de.unikoblenz.fgbks.base.domain.Name; ...@@ -6,18 +6,29 @@ import de.unikoblenz.fgbks.base.domain.Name;
public abstract class AbstractClassificationType implements ClassificationType { public abstract class AbstractClassificationType implements ClassificationType {
protected Name name; protected Name name;
protected Name niceName;
protected Description description; protected Description description;
protected AbstractClassificationType(Name name, Description description) { protected AbstractClassificationType(Name name, Name niceName, Description description) {
this.name = name; this.name = name;
this.niceName = niceName;
this.description = description; this.description = description;
} }
protected AbstractClassificationType(Name name, Description description) {
this(name, new Name(name), description);
}
@Override @Override
public Name getName() { public Name getName() {
return name; return name;
} }
@Override
public Name getNiceName() {
return niceName;
}
@Override @Override
public Description getDescription() { public Description getDescription() {
return description; return description;
......
...@@ -12,6 +12,10 @@ public interface ClassificationType extends Serializable { ...@@ -12,6 +12,10 @@ public interface ClassificationType extends Serializable {
@JsonbProperty("name") @JsonbProperty("name")
Name getName(); Name getName();
@NotNull
@JsonbProperty("niceName")
Name getNiceName();
@NotNull @NotNull
@JsonbProperty("description") @JsonbProperty("description")
Description getDescription(); Description getDescription();
......
...@@ -10,7 +10,7 @@ public class DecisionLogicLevelVerification extends AbstractClassificationType { ...@@ -10,7 +10,7 @@ public class DecisionLogicLevelVerification extends AbstractClassificationType {
new DecisionLogicLevelVerification(); new DecisionLogicLevelVerification();
private 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() { public static DecisionLogicLevelVerification getInstance() {
......
...@@ -6,11 +6,10 @@ import de.unikoblenz.fgbks.base.domain.Name; ...@@ -6,11 +6,10 @@ import de.unikoblenz.fgbks.base.domain.Name;
@Classification @Classification
public class DrdModelingLevelVerification extends AbstractClassificationType { public class DrdModelingLevelVerification extends AbstractClassificationType {
private static final DrdModelingLevelVerification instance = private static final DrdModelingLevelVerification instance = new DrdModelingLevelVerification();
new DrdModelingLevelVerification();
private 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() { public static DrdModelingLevelVerification getInstance() {
......
...@@ -7,18 +7,29 @@ import java.util.Objects; ...@@ -7,18 +7,29 @@ import java.util.Objects;
public abstract class AbstractVerificationType implements VerificationType { public abstract class AbstractVerificationType implements VerificationType {
protected Name name; protected Name name;
protected Name niceName;
protected Description description; protected Description description;
protected AbstractVerificationType(Name name, Description description) { protected AbstractVerificationType(Name name, Name niceName, Description description) {
this.name = name; this.name = name;
this.niceName = niceName;
this.description = description; this.description = description;
} }
protected AbstractVerificationType(Name name, Description description) {
this(name, new Name(name), description);
}
@Override @Override
public Name getName() { public Name getName() {
return name; return name;
} }
@Override
public Name getNiceName() {
return niceName;
}
@Override @Override
public Description getDescription() { public Description getDescription() {
return description; return description;
......
...@@ -12,7 +12,10 @@ public class DateVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class DateVerification extends AbstractVerificationType {
private static final DateVerification instance = new DateVerification(); private static final DateVerification instance = new DateVerification();
private 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() { public static DateVerification getInstance() {
......
...@@ -12,7 +12,10 @@ public class EmptyOutputVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class EmptyOutputVerification extends AbstractVerificationType {
private static final EmptyOutputVerification instance = new EmptyOutputVerification(); private static final EmptyOutputVerification instance = new EmptyOutputVerification();
private 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() { public static EmptyOutputVerification getInstance() {
......
...@@ -12,7 +12,10 @@ public class EquivalentStringVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class EquivalentStringVerification extends AbstractVerificationType {
private static final EquivalentStringVerification instance = new EquivalentStringVerification(); private static final EquivalentStringVerification instance = new EquivalentStringVerification();
private 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() { public static EquivalentStringVerification getInstance() {
......
...@@ -13,7 +13,7 @@ public class IdenticalBusinessRuleVerification extends AbstractVerificationType ...@@ -13,7 +13,7 @@ public class IdenticalBusinessRuleVerification extends AbstractVerificationType
new IdenticalBusinessRuleVerification(); new IdenticalBusinessRuleVerification();
private IdenticalBusinessRuleVerification() { private IdenticalBusinessRuleVerification() {
super(new Name("IdenticalBusinessRuleVerification"), new Description("test")); // TODO super(new Name("Identical Rules"), new Description("test")); // TODO
} }
public static IdenticalBusinessRuleVerification getInstance() { public static IdenticalBusinessRuleVerification getInstance() {
......
...@@ -14,6 +14,7 @@ public class InputValueSyntaxVerification extends AbstractVerificationType { ...@@ -14,6 +14,7 @@ public class InputValueSyntaxVerification extends AbstractVerificationType {
private InputValueSyntaxVerification() { private InputValueSyntaxVerification() {
super( super(
new Name("InputValueSyntaxVerification"), new Name("InputValueSyntaxVerification"),
new Name("Input Value Syntax Check"),
new Description("Check values for syntactical correctness.")); new Description("Check values for syntactical correctness."));
} }
......
...@@ -14,6 +14,7 @@ public class LonelyDataInputVerification extends AbstractVerificationType { ...@@ -14,6 +14,7 @@ public class LonelyDataInputVerification extends AbstractVerificationType {
private LonelyDataInputVerification() { private LonelyDataInputVerification() {
super( super(
new Name("LonelyDataInputVerification"), new Name("LonelyDataInputVerification"),
new Name("Lonely Data Input"),
new Description( new Description(
"Checks for any input data node, if it has no connection to at least one decision table.")); "Checks for any input data node, if it has no connection to at least one decision table."));
} }
......
...@@ -15,8 +15,8 @@ public class MissingInputColumnVerification extends AbstractVerificationType { ...@@ -15,8 +15,8 @@ public class MissingInputColumnVerification extends AbstractVerificationType {
private MissingInputColumnVerification() { private MissingInputColumnVerification() {
super( super(
new Name("MissingInputColumnVerification"), new Name("MissingInputColumnVerification"),
new Description( new Name("Missing Input Column"),
"todo")); // TODO englisch new Description("todo")); // TODO
} }
public static MissingInputColumnVerification getInstance() { public static MissingInputColumnVerification getInstance() {
......
...@@ -15,8 +15,9 @@ public class MissingInputDataVerification extends AbstractVerificationType { ...@@ -15,8 +15,9 @@ public class MissingInputDataVerification extends AbstractVerificationType {
private MissingInputDataVerification() { private MissingInputDataVerification() {
super( super(
new Name("MissingInputDataVerification"), new Name("MissingInputDataVerification"),
new Name("Missing Input Data"),
new Description( new Description(
"todo")); // TODO englisch "todo")); // TODO
} }
public static MissingInputDataVerification getInstance() { public static MissingInputDataVerification getInstance() {
......
...@@ -12,7 +12,10 @@ public class MissingRuleVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class MissingRuleVerification extends AbstractVerificationType {
private static final MissingRuleVerification instance = new MissingRuleVerification(); private static final MissingRuleVerification instance = new MissingRuleVerification();
private 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() { public static MissingRuleVerification getInstance() {
......
...@@ -12,7 +12,10 @@ public class OverlappingVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class OverlappingVerification extends AbstractVerificationType {
private static final OverlappingVerification instance = new OverlappingVerification(); private static final OverlappingVerification instance = new OverlappingVerification();
private 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() { public static OverlappingVerification getInstance() {
......
...@@ -12,7 +12,10 @@ public class PartialReductionVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class PartialReductionVerification extends AbstractVerificationType {
private static final PartialReductionVerification instance = new PartialReductionVerification(); private static final PartialReductionVerification instance = new PartialReductionVerification();
private 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() { public static PartialReductionVerification getInstance() {
......
...@@ -14,6 +14,7 @@ public class PredefinedExistingValueVerification extends AbstractVerificationTyp ...@@ -14,6 +14,7 @@ public class PredefinedExistingValueVerification extends AbstractVerificationTyp
private PredefinedExistingValueVerification() { private PredefinedExistingValueVerification() {
super( super(
new Name("PredefinedExistingValueVerification"), new Name("PredefinedExistingValueVerification"),
new Name("Predefined Existing Values"),
new Description( new Description(
"Es gibt in einer Tabellen-Zelle einen String Value, der aber nicht in der Liste der " "Es gibt in einer Tabellen-Zelle einen String Value, der aber nicht in der Liste der "
+ "Predefines Values vorgesehen ist.")); // TODO englisch + "Predefines Values vorgesehen ist.")); // TODO englisch
......
...@@ -15,6 +15,7 @@ public class PredefinedMissingValueVerification extends AbstractVerificationType ...@@ -15,6 +15,7 @@ public class PredefinedMissingValueVerification extends AbstractVerificationType
private PredefinedMissingValueVerification() { private PredefinedMissingValueVerification() {
super( super(
new Name("PredefinedMissingValueVerification"), new Name("PredefinedMissingValueVerification"),
new Name("Predefined Missing Values"),
new Description( new Description(
"Es gibt in einer Tabellen-Zelle predefines values, die jedoch nicht in der spalte vorhanden sind.")); // TODO englisch "Es gibt in einer Tabellen-Zelle predefines values, die jedoch nicht in der spalte vorhanden sind.")); // TODO englisch
} }
......
...@@ -12,7 +12,10 @@ public class SubsumptionVerification extends AbstractVerificationType { ...@@ -12,7 +12,10 @@ public class SubsumptionVerification extends AbstractVerificationType {
private static final SubsumptionVerification instance = new SubsumptionVerification(); private static final SubsumptionVerification instance = new SubsumptionVerification();
private 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() { public static SubsumptionVerification getInstance() {
......
...@@ -17,6 +17,10 @@ public interface VerificationType extends ValueObject { ...@@ -17,6 +17,10 @@ public interface VerificationType extends ValueObject {
@JsonbProperty("name") @JsonbProperty("name")
Name getName(); Name getName();
@NotNull
@JsonbProperty("niceName")
Name getNiceName();
@NotNull @NotNull
@JsonbProperty("description") @JsonbProperty("description")
Description getDescription(); Description getDescription();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment