diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/json/PrivateVisibilityStrategy.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/json/PrivateVisibilityStrategy.java index 8ab6492b450fc097486b059486a46c20a1122ed8..d3c08ce2df6bcb8d025554fc4b84a9322a7ce676 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/json/PrivateVisibilityStrategy.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/json/PrivateVisibilityStrategy.java @@ -15,7 +15,8 @@ public class PrivateVisibilityStrategy implements PropertyVisibilityStrategy { @Override public boolean isVisible(Field field) { - return !field.isAnnotationPresent(JsonbTransient.class); + return !field.isAnnotationPresent(JsonbTransient.class) + && Modifier.isPublic(field.getModifiers()); } @Override diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/VerificationResultEntry.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/VerificationResultEntry.java index 279c2d533d8409de42c67740c5f9a9aa5c882b93..00f31cc69fc7314b000b15e3f224b23252a680f6 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/VerificationResultEntry.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/VerificationResultEntry.java @@ -22,6 +22,14 @@ import org.apache.commons.lang3.Validate; public class VerificationResultEntry extends AbstractResultObject { private List<VerificationFix> verificationFixes; + private Set<VerificationResultEntryElement> verificationResultEntryElements; + private Message message; + private VerificationClassification verificationClassification; + + protected VerificationResultEntry() { + this.verificationResultEntryElements = ConcurrentHashMap.newKeySet(); + verificationFixes = new ArrayList<>(); + } /** * Get the list of {@link VerificationFix}es. @@ -32,14 +40,6 @@ public class VerificationResultEntry extends AbstractResultObject { public List<VerificationFix> getVerificationsFixes() { return Collections.unmodifiableList(verificationFixes); } - private Set<VerificationResultEntryElement> verificationResultEntryElements; - private Message message; - private VerificationClassification verificationClassification; - - protected VerificationResultEntry() { - this.verificationResultEntryElements = ConcurrentHashMap.newKeySet(); - verificationFixes = new ArrayList<>(); - } /** * Get the amount of verification result entry elements. @@ -52,25 +52,13 @@ public class VerificationResultEntry extends AbstractResultObject { } /** - * Enum to classify one {@link VerificationResultEntry}. + * Get the {@link VerificationClassification}. + * + * @return the {@link VerificationClassification} */ - public enum VerificationClassification { - /** - * Only information. - */ - INFO, - /** - * Warning. No action needed. - */ - WARNING, - /** - * Error. Action needed. - */ - ERROR, - /** - * Fatal error. Must be fixed, so that the dmn is executable. - */ - FATAL_ERROR + @JsonbProperty("verificationClassifications") + public VerificationClassification getVerificationClassification() { + return verificationClassification; } /** @@ -84,13 +72,17 @@ public class VerificationResultEntry extends AbstractResultObject { } /** - * Get the {@link VerificationClassification}. - * - * @return the {@link VerificationClassification} + * Enum to classify one {@link VerificationResultEntry}. */ - @JsonbProperty("verificationClassification") - public VerificationClassification getVerificationClassification() { - return verificationClassification; + public enum VerificationClassification { + /** Only information. */ + INFO, + /** Warning. No action needed. */ + WARNING, + /** Error. Action needed. */ + ERROR, + /** Fatal error. Must be fixed, so that the dmn is executable. */ + FATAL_ERROR } /** diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/actions/VerificationFix.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/actions/VerificationFix.java index 79f0f6f2242babe0bb51756964553fc2c78cb4c6..32ffe59277858bba20224eb08cc6dd7d58619ec8 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/actions/VerificationFix.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/result/actions/VerificationFix.java @@ -8,6 +8,7 @@ import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.Action.AC 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 com.fasterxml.jackson.annotation.JsonProperty; import de.unikoblenz.fgbks.base.builder.DefaultBuilder; import de.unikoblenz.fgbks.base.domain.Name; import java.util.ArrayList; @@ -68,6 +69,16 @@ public class VerificationFix { private Name fixName; private List<Action> actions; + @JsonProperty("fixName") + public Name getFixName() { + return fixName; + } + + @JsonProperty("actions") + public List<Action> getActions() { + return actions; + } + private VerificationFix() { fixName = DEFAULT_FIX_NAME; actions = new ArrayList<>();