Merge pull request #31 from maxmind/greg/anonymizer

 Update geoip2 to 2.10.0 and add anonymizer tests

Author: oalders

CHANGELOG.md

@@ -10,6 +10,11 @@ CHANGELOG
   * `EMERCHANTPAY`
   * `HEARTLAND`
   * `PAYWAY`
+* Updated `geoip2` dependency to add support for GeoIP2 Precision
+  Insights anonymizer fields.
+* Replaced use of deprecated `com.fasterxml.jackson.databind.util.ISO8601DateFormat`
+  with `com.fasterxml.jackson.databind.util.StdDateFormat` where
+  `withColonInTimeZone` is set to `true`.
 
 1.6.0 (2017-09-08)
 ------------------

pom.xml

@@ -42,22 +42,22 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
             <artifactId>geoip2</artifactId>
-            <version>2.9.0</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.8.0</version>
+            <version>2.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -4,7 +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 com.fasterxml.jackson.databind.util.StdDateFormat;
 
 import java.io.IOException;
 
@@ -20,7 +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.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
 
         return mapper.writeValueAsString(this);

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

@@ -6,7 +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.fasterxml.jackson.databind.util.StdDateFormat;
 import com.maxmind.minfraud.exception.*;
 import com.maxmind.minfraud.request.Transaction;
 import com.maxmind.minfraud.response.FactorsResponse;
@@ -62,7 +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());
+        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
 
         RequestConfig.Builder configBuilder = RequestConfig.custom()
                 .setConnectTimeout(builder.connectTimeout)

src/test/java/com/maxmind/minfraud/response/IpAddressTest.java

@@ -24,12 +24,26 @@ public void testIpAddress() throws Exception {
                         .startObjectField("location")
                         .put("local_time", time)
                         .end()
+                        .startObjectField("traits")
+                        .put("ip_address", "1.2.3.4")
+                        .put("is_anonymous", true)
+                        .put("is_anonymous_vpn", true)
+                        .put("is_hosting_provider", true)
+                        .put("is_public_proxy", true)
+                        .put("is_tor_exit_node", true)
+                        .end()
                         .end()
                         .finish()
         );
 
         assertEquals("IP risk", new Double(99), address.getRisk());
         assertEquals("correct local time", time, address.getLocation().getLocalTime());
         assertTrue("isHighRisk", address.getCountry().isHighRisk());
+        assertTrue("isAnonymous", address.getTraits().isAnonymous());
+        assertTrue("isAnonymousVpn", address.getTraits().isAnonymousVpn());
+        assertTrue("isHostingProvider", address.getTraits().isHostingProvider());
+        assertTrue("isPublicProxy", address.getTraits().isPublicProxy());
+        assertTrue("isTorExitNode", address.getTraits().isTorExitNode());
+
     }
 }

src/test/resources/test-data/factors-response.json

@@ -85,6 +85,12 @@
     "traits": {
       "domain": "in-addr.arpa",
       "ip_address": "81.2.69.160",
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "is_hosting_provider": true,
+      "is_public_proxy": true,
+      "is_satellite_provider": true,
+      "is_tor_exit_node": true,
       "isp": "Andrews & Arnold Ltd",
       "organization": "STONEHOUSE office network",
       "user_type": "government"

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

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

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

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

src/test/resources/test-data/insights-response.json

@@ -85,6 +85,12 @@
     "traits": {
       "domain": "in-addr.arpa",
       "ip_address": "81.2.69.160",
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "is_hosting_provider": true,
+      "is_public_proxy": true,
+      "is_satellite_provider": true,
+      "is_tor_exit_node": true,
       "isp": "Andrews & Arnold Ltd",
       "organization": "STONEHOUSE office network",
       "user_type": "government"