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

Add default show actions

parent 95165570
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,11 @@ package de.unikoblenz.fgbks.core.dmn.verification.result; ...@@ -2,7 +2,11 @@ package de.unikoblenz.fgbks.core.dmn.verification.result;
import de.unikoblenz.fgbks.base.builder.DefaultBuilder; import de.unikoblenz.fgbks.base.builder.DefaultBuilder;
import de.unikoblenz.fgbks.base.domain.Message; import de.unikoblenz.fgbks.base.domain.Message;
import de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import javax.json.bind.annotation.JsonbProperty; import javax.json.bind.annotation.JsonbProperty;
...@@ -10,19 +14,19 @@ import org.apache.commons.lang3.Validate; ...@@ -10,19 +14,19 @@ import org.apache.commons.lang3.Validate;
public class VerificationResultEntry extends AbstractResultObject { public class VerificationResultEntry extends AbstractResultObject {
public enum VerificationClassification { private List<VerificationFix> verificationFixes;
INFO,
WARNING,
ERROR,
FATAL_ERROR;
}
private Set<VerificationResultEntryElement> verificationResultEntryElements; private Set<VerificationResultEntryElement> verificationResultEntryElements;
private Message message; private Message message;
private VerificationClassification verificationClassification; private VerificationClassification verificationClassification;
protected VerificationResultEntry() { protected VerificationResultEntry() {
this.verificationResultEntryElements = ConcurrentHashMap.newKeySet(); verificationResultEntryElements = ConcurrentHashMap.newKeySet();
verificationFixes = new ArrayList<>();
}
@JsonbProperty("verificationFixes")
public List<VerificationFix> getVerificationsFixes() {
return Collections.unmodifiableList(verificationFixes);
} }
@JsonbProperty("size") @JsonbProperty("size")
...@@ -45,6 +49,13 @@ public class VerificationResultEntry extends AbstractResultObject { ...@@ -45,6 +49,13 @@ public class VerificationResultEntry extends AbstractResultObject {
return new Message(message); return new Message(message);
} }
public enum VerificationClassification {
INFO,
WARNING,
ERROR,
FATAL_ERROR
}
private void addVerificationResultEntry( private void addVerificationResultEntry(
VerificationResultEntryElement verificationResultEntryElement) { VerificationResultEntryElement verificationResultEntryElement) {
this.verificationResultEntryElements.add(verificationResultEntryElement); this.verificationResultEntryElements.add(verificationResultEntryElement);
...@@ -72,6 +83,11 @@ public class VerificationResultEntry extends AbstractResultObject { ...@@ -72,6 +83,11 @@ public class VerificationResultEntry extends AbstractResultObject {
return this; return this;
} }
public Builder addAction(VerificationFix verificationFix) {
value.verificationFixes.add(Validate.notNull(verificationFix));
return this;
}
@Override @Override
protected void validate() { protected void validate() {
super.validate(); super.validate();
......
package de.unikoblenz.fgbks.core.dmn.verification.result.actions; package de.unikoblenz.fgbks.core.dmn.verification.result.actions;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.ActionScope.INPUT_ENTRY;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.ActionScope.OUTPUT_ENTRY;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.ActionScope.RULE;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.ActionType.SHOW;
import de.unikoblenz.fgbks.base.builder.DefaultBuilder; import de.unikoblenz.fgbks.base.builder.DefaultBuilder;
import de.unikoblenz.fgbks.base.domain.Name;
import de.unikoblenz.fgbks.core.dmn.verification.result.AbstractResultObject; import de.unikoblenz.fgbks.core.dmn.verification.result.AbstractResultObject;
import java.util.HashMap; import java.util.HashMap;
import javax.json.bind.annotation.JsonbProperty; import javax.json.bind.annotation.JsonbProperty;
...@@ -9,15 +13,24 @@ import org.apache.commons.lang3.Validate; ...@@ -9,15 +13,24 @@ import org.apache.commons.lang3.Validate;
public class Action extends AbstractResultObject { public class Action extends AbstractResultObject {
private static final Name DEFAULT_ACTION_NAME = new Name("Fix"); public static Action ACTION_SHOW_RULES;
public static Action ACTION_SHOW_INPUT_ENTRIES;
public static Action ACTION_SHOW_OUTPUT_ENTRIES;
static {
ACTION_SHOW_RULES = getBuilder().withActionType(SHOW).withActionScope(RULE).build();
ACTION_SHOW_INPUT_ENTRIES =
getBuilder().withActionType(SHOW).withActionScope(INPUT_ENTRY).build();
ACTION_SHOW_OUTPUT_ENTRIES =
getBuilder().withActionType(SHOW).withActionScope(OUTPUT_ENTRY).build();
}
private ActionType actionType; private ActionType actionType;
private ActionScope actionScope; private ActionScope actionScope;
private HashMap<String, String> values; private HashMap<String, String> values;
private Name actionName;
private Action() { private Action() {
values = new HashMap<>(); values = new HashMap<>();
actionName = DEFAULT_ACTION_NAME;
} }
@JsonbProperty("actionType") @JsonbProperty("actionType")
...@@ -35,9 +48,8 @@ public class Action extends AbstractResultObject { ...@@ -35,9 +48,8 @@ public class Action extends AbstractResultObject {
return new HashMap<>(values); return new HashMap<>(values);
} }
@JsonbProperty("actionName") private static Builder getBuilder() {
public Name getActionName() { return new Action().new Builder();
return actionName;
} }
private class Builder extends DefaultBuilder<Action> { private class Builder extends DefaultBuilder<Action> {
...@@ -53,18 +65,15 @@ public class Action extends AbstractResultObject { ...@@ -53,18 +65,15 @@ public class Action extends AbstractResultObject {
} }
public Builder addValue(String key, String value) { public Builder addValue(String key, String value) {
this.value.values.put(Validate.notNull(key), value); this.value.values.put(Validate.notNull(key), Validate.notNull(value));
return this;
}
public Builder withActionName(Name actionName) {
this.value.actionName = actionName;
return this; return this;
} }
@Override @Override
protected void validate() { protected void validate() {
super.validate(); super.validate();
Validate.notNull(actionScope);
Validate.notNull(actionType);
} }
} }
} }
...@@ -2,6 +2,8 @@ package de.unikoblenz.fgbks.core.dmn.verification.result.actions; ...@@ -2,6 +2,8 @@ package de.unikoblenz.fgbks.core.dmn.verification.result.actions;
public enum ActionScope { public enum ActionScope {
RULE, RULE,
INPUT_ENTRY,
OUTPUT_ENTRY,
INPUT_NODE, INPUT_NODE,
INPUT_COLUMN, INPUT_COLUMN,
OUTPUT_COLUMN OUTPUT_COLUMN
......
...@@ -3,5 +3,6 @@ package de.unikoblenz.fgbks.core.dmn.verification.result.actions; ...@@ -3,5 +3,6 @@ package de.unikoblenz.fgbks.core.dmn.verification.result.actions;
public enum ActionType { public enum ActionType {
UPDATE, UPDATE,
CREATE, CREATE,
DELETE DELETE,
SHOW // READ
} }
package de.unikoblenz.fgbks.core.dmn.verification.result.actions;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.Action.ACTION_SHOW_INPUT_ENTRIES;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.Action.ACTION_SHOW_OUTPUT_ENTRIES;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.Action.ACTION_SHOW_RULES;
import de.unikoblenz.fgbks.base.builder.DefaultBuilder;
import de.unikoblenz.fgbks.base.domain.Name;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.Validate;
public class VerificationFix {
private static final Name DEFAULT_FIX_NAME = new Name("Fix");
private static final Name DEFAULT_SHOW_NAME = new Name("Show");
public static VerificationFix SHOW_RULES;
public static VerificationFix SHOW_INPUT_ENTRIES;
public static VerificationFix SHOW_OUTPUT_ENTRIES;
static {
SHOW_RULES =
VerificationFix.getBuilder()
.withFixName(DEFAULT_SHOW_NAME)
.addAction(ACTION_SHOW_RULES)
.build();
SHOW_INPUT_ENTRIES =
VerificationFix.getBuilder()
.withFixName(DEFAULT_SHOW_NAME)
.addAction(ACTION_SHOW_INPUT_ENTRIES)
.build();
SHOW_OUTPUT_ENTRIES =
VerificationFix.getBuilder()
.withFixName(DEFAULT_SHOW_NAME)
.addAction(ACTION_SHOW_OUTPUT_ENTRIES)
.build();
}
private Name fixName;
private List<Action> actions;
private VerificationFix() {
fixName = DEFAULT_FIX_NAME;
actions = new ArrayList<>();
}
private static Builder getBuilder() {
return new VerificationFix().new Builder();
}
private class Builder extends DefaultBuilder<VerificationFix> {
public Builder withFixName(Name fixName) {
value.fixName = fixName;
return this;
}
public Builder addAction(Action action) {
value.actions.add(Validate.notNull(action));
return this;
}
@Override
protected void validate() {
super.validate();
Validate.notNull(fixName);
}
}
}
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