diff --git a/pom.xml b/pom.xml index 5ccd687..3ccfe96 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.oneteme.traceapi traceapi-core - 1.0.0 + 0.0.1-SNAPSHOT jar traceapi-core traceapi-core diff --git a/src/main/java/org/usf/traceapi/core/IncomingRequest.java b/src/main/java/org/usf/traceapi/core/IncomingRequest.java index 567d45a..878820c 100644 --- a/src/main/java/org/usf/traceapi/core/IncomingRequest.java +++ b/src/main/java/org/usf/traceapi/core/IncomingRequest.java @@ -26,12 +26,12 @@ public final class IncomingRequest extends OutcomingRequest implements Session { private final Collection requests; private final Collection queries; - @JsonCreator //remove this public IncomingRequest(String id) { this(id, new LinkedList<>(), new LinkedList<>()); } - IncomingRequest(String id, Collection requests, Collection queries) { + @JsonCreator + public IncomingRequest(String id, Collection requests, Collection queries) { super(id); this.requests = requests; this.queries = queries; diff --git a/src/main/java/org/usf/traceapi/core/OutcomingQuery.java b/src/main/java/org/usf/traceapi/core/OutcomingQuery.java index 5a49fe1..1b164be 100644 --- a/src/main/java/org/usf/traceapi/core/OutcomingQuery.java +++ b/src/main/java/org/usf/traceapi/core/OutcomingQuery.java @@ -6,8 +6,6 @@ import java.util.LinkedList; import java.util.List; -import com.fasterxml.jackson.annotation.JsonCreator; - import lombok.Getter; import lombok.Setter; @@ -30,12 +28,7 @@ public class OutcomingQuery implements Metric { private String driverVersion; private String thread; private boolean failed; - private final List actions; - - @JsonCreator //remove this - public OutcomingQuery() { - this.actions = new LinkedList<>(); - } + private final List actions = new LinkedList<>(); public void append(DatabaseAction action) { actions.add(action); diff --git a/src/main/java/org/usf/traceapi/core/OutcomingRequest.java b/src/main/java/org/usf/traceapi/core/OutcomingRequest.java index ebf9dac..2549ac9 100644 --- a/src/main/java/org/usf/traceapi/core/OutcomingRequest.java +++ b/src/main/java/org/usf/traceapi/core/OutcomingRequest.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import lombok.Getter; -import lombok.RequiredArgsConstructor; import lombok.Setter; /** @@ -17,7 +16,6 @@ */ @Getter @Setter -@RequiredArgsConstructor(onConstructor_ = @JsonCreator) public class OutcomingRequest implements Metric { private final String id; @@ -36,6 +34,11 @@ public class OutcomingRequest implements Metric { private Instant end; private String thread; + @JsonCreator + public OutcomingRequest(String id) { + this.id = id; + } + @Override public String toString() { return format("%-20s", thread) + ": REQUEST {" + format("%5s", duration()) + "ms}";