Merge pull request #577 from jekh/remove-javax-datatype-converter

jekh · web-flow · commit 062046420243 · 2016-12-18T23:22:49.000-08:00
Remove references to javax.xml.bind.DatatypeConverter
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCacheStatus.java
@@ -1,8 +1,7 @@
 package net.lightbody.bmp.core.har;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import net.lightbody.bmp.core.json.ISO8601DateFormatter;
 
 import java.util.Date;
 
@@ -14,7 +13,7 @@ public class HarCacheStatus {
     private volatile int hitCount;
     private volatile String comment = "";
 
-    @JsonSerialize(using = ISO8601DateFormatter.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     public Date getExpires() {
         return expires;
     }
@@ -23,7 +22,7 @@ public void setExpires(Date expires) {
         this.expires = expires;
     }
 
-    @JsonSerialize(using = ISO8601DateFormatter.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
     public Date getLastAccess() {
         return lastAccess;
     }
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarCookie.java
@@ -1,10 +1,9 @@
 package net.lightbody.bmp.core.har;
 
-import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
+
+import java.util.Date;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class HarCookie {
@@ -49,7 +48,7 @@ public void setDomain(String domain) {
         this.domain = domain;
     }
 
-    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
     public Date getExpires() {
         return expires;
     }
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
@@ -1,9 +1,8 @@
 package net.lightbody.bmp.core.har;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -36,7 +35,7 @@ public void setPageref(String pageref) {
         this.pageref = pageref;
     }
 
-    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
     public Date getStartedDateTime() {
         return startedDateTime;
     }
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/har/HarPage.java
@@ -1,10 +1,9 @@
 package net.lightbody.bmp.core.har;
 
-import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
+
+import java.util.Date;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class HarPage {
@@ -35,7 +34,7 @@ public void setId(String id) {
         this.id = id;
     }
 
-    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
     public Date getStartedDateTime() {
         return startedDateTime;
     }
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601DateFormatter.java
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java b/browsermob-core/src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
@@ -1,6 +1,7 @@
 package net.lightbody.bmp.filters;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.io.BaseEncoding;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpContent;
@@ -30,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.DatatypeConverter;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
@@ -477,7 +477,7 @@ protected void captureResponseContent(HttpResponse httpResponse, byte[] fullMess
             String text = BrowserMobHttpUtil.getContentAsString(fullMessage, charset);
             harEntry.getResponse().getContent().setText(text);
         } else if (dataToCapture.contains(CaptureType.RESPONSE_BINARY_CONTENT)) {
-            harEntry.getResponse().getContent().setText(DatatypeConverter.printBase64Binary(fullMessage));
+            harEntry.getResponse().getContent().setText(BaseEncoding.base64().encode(fullMessage));
             harEntry.getResponse().getContent().setEncoding("base64");
         }
 
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java b/browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java
@@ -1,5 +1,6 @@
 package net.lightbody.bmp.util;
 
+import com.google.common.io.BaseEncoding;
 import com.google.common.net.HostAndPort;
 import com.google.common.net.MediaType;
 import io.netty.buffer.ByteBuf;
@@ -11,7 +12,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -295,6 +295,6 @@ public static String base64EncodeBasicCredentials(String username, String passwo
         // using UTF-8, which is the modern de facto standard, and which retains compatibility with US_ASCII for ASCII characters,
         // as required by RFC 7616, section 3: http://tools.ietf.org/html/rfc7617#section-3
         byte[] credentialsAsUtf8Bytes = credentialsToEncode.getBytes(StandardCharsets.UTF_8);
-        return DatatypeConverter.printBase64Binary(credentialsAsUtf8Bytes);
+        return BaseEncoding.base64().encode(credentialsAsUtf8Bytes);
     }
 }
diff --git a/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.BaseEncoding;
 import net.lightbody.bmp.client.ClientUtil;
 import net.lightbody.bmp.core.har.Har;
 import net.lightbody.bmp.core.har.HarCookie;
@@ -89,7 +90,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -1099,7 +1099,7 @@ private boolean hasTextualContent(String contentType) {
 	}
 
 	private void setBinaryContentOfEntry(HarEntry entry, ByteArrayOutputStream copy) {
-        entry.getResponse().getContent().setText(DatatypeConverter.printBase64Binary(copy.toByteArray()));
+        entry.getResponse().getContent().setText(BaseEncoding.base64().encode(copy.toByteArray()));
 		entry.getResponse().getContent().setEncoding("base64");
 	}
 
diff --git a/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java b/browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpRequest.java
@@ -1,17 +1,8 @@
 package net.lightbody.bmp.proxy.http;
 
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.common.io.BaseEncoding;
 import net.lightbody.bmp.proxy.jetty.http.HttpRequest;
 import net.lightbody.bmp.proxy.util.ClonedInputStream;
-
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
@@ -26,7 +17,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.DatatypeConverter;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class BrowserMobHttpRequest {
     private static final Logger LOG = LoggerFactory.getLogger(BrowserMobHttpRequest.class);
@@ -89,7 +87,7 @@ public void setRequestBody(String body) {
     }
 
     public void setRequestBodyAsBase64EncodedBytes(String bodyBase64Encoded) {
-        byteArrayEntity = new ByteArrayEntity(DatatypeConverter.parseBase64Binary(bodyBase64Encoded));
+        byteArrayEntity = new ByteArrayEntity(BaseEncoding.base64().decode(bodyBase64Encoded));
     }
 
     public void setRequestInputStream(InputStream is, long length) {
diff --git a/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/ConfigModule.java b/browsermob-rest/src/main/java/net/lightbody/bmp/proxy/guice/ConfigModule.java
@@ -1,8 +1,10 @@
 package net.lightbody.bmp.proxy.guice;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.Provider;
 import joptsimple.ArgumentAcceptingOptionSpec;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -11,6 +13,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.TimeZone;
 
 public class ConfigModule implements Module {
     private String[] args;
@@ -102,5 +105,17 @@ public void configure(Binder binder) {
         binder.bind(Key.get(Integer.class, new NamedImpl("ttl"))).toInstance(ttlSpec.value(options));
 
         binder.bind(LegacyProxyServer.class).toProvider(LegacyProxyServerProvider.class);
+
+        // bind an ObjectMapper provider that uses the system time zone instead of UTC by default
+        binder.bind(ObjectMapper.class).toProvider(new Provider<ObjectMapper>() {
+            @Override
+            public ObjectMapper get() {
+                ObjectMapper objectMapper = new ObjectMapper();
+
+                objectMapper.setTimeZone(TimeZone.getDefault());
+
+                return objectMapper;
+            }
+        });
     }
 }
