diff --git a/dmnverifierapi/pom.xml b/dmnverifierapi/pom.xml index a9ad45f3a5bb28adf0db7a38617b5cdf55c2a9d4..700bf213f332144948c9334e50456778d61b760e 100644 --- a/dmnverifierapi/pom.xml +++ b/dmnverifierapi/pom.xml @@ -35,25 +35,6 @@ <artifactId>jwi</artifactId> <version>2.2.3</version> </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core --> - <dependency> - <artifactId>jackson-core</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> - <version>2.10.0</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> - <dependency> - <artifactId>jackson-databind</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> - <version>2.10.0</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations --> - <dependency> - <artifactId>jackson-annotations</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> - <version>2.10.0</version> - </dependency> - <!-- Utils --> <dependency> <groupId>org.apache.commons</groupId> diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/Metric.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/Metric.java index c0f682ea089e0a58e1a1e68dc1d88c72e78d157b..bf99810b4746ac0377b3e8807e2add65f445c74f 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/Metric.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/Metric.java @@ -1,11 +1,11 @@ package de.unikoblenz.fgbks.core.dmn.verification.metrics; -import com.fasterxml.jackson.annotation.JsonProperty; import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.VerificationType; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import javax.json.bind.annotation.JsonbProperty; /** * A metric instance give statistics about the execution of one verifier {@link VerificationType}). @@ -29,7 +29,7 @@ public class Metric implements Serializable { * * @return the number of executions */ - @JsonProperty("amountOfExecutions") + @JsonbProperty("amountOfExecutions") public int getAmountOfExecutions() { return executionTimes.size(); } @@ -39,7 +39,7 @@ public class Metric implements Serializable { * * @return the average execution time */ - @JsonProperty("averageExecutionTime") + @JsonbProperty("averageExecutionTime") public double getAverageExecutionTime() { return executionTimes.stream().mapToLong(Long::longValue).average().orElseGet(() -> 0); } @@ -49,14 +49,14 @@ public class Metric implements Serializable { * * @return the average execution time */ - @JsonProperty("averageExecutionTimeInMs") + @JsonbProperty("averageExecutionTimeInMs") public double getAverageExecutionTimeInMs() { return executionTimes.stream().mapToLong(Long::longValue).average().orElseGet(() -> 0) / NANO_SECONDS_PER_SECOND; } /** Get the total execution time in ns. */ - @JsonProperty("totalExecutionTime") + @JsonbProperty("totalExecutionTime") public long getTotalExecutionTime() { return executionTimes.stream().mapToLong(Long::longValue).sum(); } @@ -66,7 +66,7 @@ public class Metric implements Serializable { * * @return the {@link VerificationType} */ - @JsonProperty("type") + @JsonbProperty("type") public VerificationType getType() { return type; } @@ -74,9 +74,9 @@ public class Metric implements Serializable { /** * Get the total execution time in ms. * - * @return + * @return the execution time in ms */ - @JsonProperty("totalExecutionTimeInMs") + @JsonbProperty("totalExecutionTimeInMs") public long getTotalExecutionTimeInMs() { return executionTimes.stream().mapToLong(Long::longValue).sum() / NANO_SECONDS_PER_SECOND; } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/MetricSet.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/MetricSet.java index 1a8f95aefbe67310115dd417bb591fcacd2faf8a..2d254624ee77a9d914c6d1490456554fc7956ef1 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/MetricSet.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/MetricSet.java @@ -1,10 +1,10 @@ package de.unikoblenz.fgbks.core.dmn.verification.metrics; -import com.fasterxml.jackson.annotation.JsonProperty; import de.unikoblenz.fgbks.core.dmn.verification.verifier.types.VerificationType; import java.io.Serializable; import java.util.HashSet; import java.util.Set; +import javax.json.bind.annotation.JsonbProperty; import org.apache.commons.lang3.Validate; /** @@ -19,7 +19,7 @@ public class MetricSet implements Serializable { * * @return the set of {@link Metric}s */ - @JsonProperty("verificationMetrics") + @JsonbProperty("verificationMetrics") public Set<Metric> getMetrics() { return new HashSet<>(metrics); } 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 32ffe59277858bba20224eb08cc6dd7d58619ec8..c96cc95641fbcfcc9f02bc0cebb66af6173461a8 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,11 +8,11 @@ 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; import java.util.List; +import javax.json.bind.annotation.JsonbProperty; import org.apache.commons.lang3.Validate; public class VerificationFix { @@ -69,12 +69,12 @@ public class VerificationFix { private Name fixName; private List<Action> actions; - @JsonProperty("fixName") + @JsonbProperty("fixName") public Name getFixName() { return fixName; } - @JsonProperty("actions") + @JsonbProperty("actions") public List<Action> getActions() { return actions; }