From 4863fa87389267d0981cfb3c213091a7601622c8 Mon Sep 17 00:00:00 2001 From: "kyrylo.bilchenko" Date: Thu, 31 Jan 2019 12:13:01 +0100 Subject: [PATCH] update jackson bindings --- .../java/net/lightbody/bmp/core/har/HarEntry.java | 9 +++++++++ .../java/net/lightbody/bmp/core/har/HarTimings.java | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java index 1864a78c7..5b6529322 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarEntry.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -17,6 +18,8 @@ public class HarEntry { private volatile HarCache cache = new HarCache(); private volatile HarTimings timings = new HarTimings(); private volatile String serverIPAddress; + @JsonProperty("time") + private volatile long time; private volatile String connection; private volatile String comment = ""; @@ -157,4 +160,10 @@ public String getConnection() { public void setConnection(String connection) { this.connection = connection; } + + public HarEntry setTime(long time) { + this.time = time; + return this; + } + } diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java index efb8d8612..3849baf4b 100644 --- a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java +++ b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarTimings.java @@ -1,15 +1,24 @@ package net.lightbody.bmp.core.har; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.concurrent.TimeUnit; public class HarTimings { // optional values are initialized to -1, which indicates they do not apply to the current request, according to the HAR spec + @JsonProperty("blocked") private volatile long blockedNanos = -1; + @JsonProperty("dns") private volatile long dnsNanos = -1; + @JsonProperty("connect") private volatile long connectNanos = -1; + @JsonProperty("send") private volatile long sendNanos; + @JsonProperty("wait") private volatile long waitNanos; + @JsonProperty("receive") private volatile long receiveNanos; + @JsonProperty("ssl") private volatile long sslNanos = -1; private volatile String comment = ""; @@ -49,7 +58,7 @@ public long getDns(TimeUnit timeUnit) { public void setDns(long dns, TimeUnit timeUnit) { if (dns == -1) { this.dnsNanos = -1; - } else{ + } else { this.dnsNanos = TimeUnit.NANOSECONDS.convert(dns, timeUnit); } }