Merge pull request #27 from maxmind/greg/fix-data-serialization

Fix serialization of /event/time. Fixes #26.

Author: horgh

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.5.1
+-----------------
+
+* Corrected serialization of `/event/time` input to be valid RFC 3339. Reported by
+  Luis Rojas. GitHub #26.
+
 1.5.0 (2017-07-07)
 ------------------
 

README.md

@@ -169,7 +169,7 @@ Transaction request = new Transaction.Builder(
             .amount(new BigDecimal(Double.toString(1.1)))
             .currency("USD")
             .discountCode("10OFF")
-            .referrerUri("http://www.google.com/")
+            .referrerUri(new URI("http://www.google.com/"))
             .subaffiliateId("saf9")
             .build()
     ).payment(

src/main/java/com/maxmind/minfraud/AbstractModel.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 
 import java.io.IOException;
 
@@ -19,6 +20,7 @@ public final String toJson() throws IOException {
         mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
         mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
         mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
+        mapper.setDateFormat(new ISO8601DateFormat());
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
 
         return mapper.writeValueAsString(this);

src/main/java/com/maxmind/minfraud/WebServiceClient.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.InjectableValues.Std;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import com.maxmind.minfraud.exception.*;
 import com.maxmind.minfraud.request.Transaction;
 import com.maxmind.minfraud.response.FactorsResponse;
@@ -61,6 +62,7 @@ private WebServiceClient(WebServiceClient.Builder builder) {
         mapper = new ObjectMapper();
         mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
         mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        mapper.setDateFormat(new ISO8601DateFormat());
 
         RequestConfig.Builder configBuilder = RequestConfig.custom()
                 .setConnectTimeout(builder.connectTimeout)

src/test/resources/test-data/full-request.json

@@ -2,7 +2,7 @@
   "event": {
     "transaction_id": "txn3134133",
     "shop_id": "s2123",
-    "time": "2012-04-12T23:20:50.052+0000",
+    "time": "2012-04-12T23:20:50Z",
     "type": "purchase"
   },
   "account": {