https://github.com/lightbody/browsermob-proxy/issues/44

Add DTZ is Date Format according to HAR Spec 1.2

Author: Remi Damlencour

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.0-beta-13-SNAPSHOT</version>
+    <version>2.0-beta-15-SNAPSHOT</version>
     <name>BrowserMob Proxy</name>
     <description>A programmatic HTTP/S designed for performance and functional testing</description>
     <url>http://bmp.lightbody.net</url>
@@ -65,7 +65,7 @@
                                 </program>
                             </programs>
                         </configuration>
-                        <executions>
+                        <executions>BET
                             <execution>
                                 <id>make-assembly</id>
                                 <phase>install</phase>

src/main/java/net/lightbody/bmp/core/har/HarCookie.java

@@ -1,11 +1,12 @@
 package net.lightbody.bmp.core.har;
 
-import net.lightbody.bmp.core.json.ISO8601DateFormatter;
+import java.util.Date;
+
+import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
+
 import org.codehaus.jackson.annotate.JsonWriteNullProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
-import java.util.Date;
-
 @JsonWriteNullProperties(value=false)
 public class HarCookie {
     private String name;
@@ -49,7 +50,7 @@ public void setDomain(String domain) {
         this.domain = domain;
     }
 
-    @JsonSerialize(using = ISO8601DateFormatter.class)
+    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
     public Date getExpires() {
         return expires;
     }

src/main/java/net/lightbody/bmp/core/har/HarEntry.java

@@ -1,6 +1,7 @@
 package net.lightbody.bmp.core.har;
 
-import net.lightbody.bmp.core.json.ISO8601DateFormatter;
+import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
+
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -36,7 +37,7 @@ public void setPageref(String pageref) {
         this.pageref = pageref;
     }
 
-    @JsonSerialize(using = ISO8601DateFormatter.class)
+    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
     public Date getStartedDateTime() {
         return startedDateTime;
     }

src/main/java/net/lightbody/bmp/core/har/HarPage.java

@@ -1,10 +1,11 @@
 package net.lightbody.bmp.core.har;
 
-import net.lightbody.bmp.core.json.ISO8601DateFormatter;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
 import java.util.Date;
 
+import net.lightbody.bmp.core.json.ISO8601WithTDZDateFormatter;
+
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class HarPage {
     private String id;
@@ -29,7 +30,7 @@ public void setId(String id) {
         this.id = id;
     }
 
-    @JsonSerialize(using = ISO8601DateFormatter.class)
+    @JsonSerialize(using = ISO8601WithTDZDateFormatter.class)
     public Date getStartedDateTime() {
         return startedDateTime;
     }

src/main/java/net/lightbody/bmp/core/json/ISO8601WithTDZDateFormatter.java

@@ -0,0 +1,45 @@
+package net.lightbody.bmp.core.json;
+
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.SerializerProvider;
+import org.codehaus.jackson.map.ser.ScalarSerializerBase;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+/**
+ * 
+ * @author Damien Jubeau <damien.jubeau@dareboost.com>
+ * Allows Date Format to be compliant with Har 1.2 Spec : ISO 8601 with Time Zone Designator
+ * @see https://github.com/lightbody/browsermob-proxy/issues/44
+ *
+ */
+public class ISO8601WithTDZDateFormatter extends ScalarSerializerBase<Date> {
+	
+    public final static ISO8601WithTDZDateFormatter instance = new ISO8601WithTDZDateFormatter();
+    private final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    
+
+    public ISO8601WithTDZDateFormatter() {
+        super(java.util.Date.class);
+    }
+
+    @Override
+    public void serialize(java.util.Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
+        jgen.writeString(df.format(value));
+    }
+
+
+    @Override
+    public JsonNode getSchema(SerializerProvider provider, Type typeHint) throws JsonMappingException {
+        return createSchemaNode("string", true);
+    }
+
+}