Update to support isInEuropeanUnion()

Author: horgh

CHANGELOG.md

@@ -4,6 +4,10 @@ CHANGELOG
 1.8.0
 ------------------
 
+* Updated `geoip2` dependency. This version adds the `isInEuropeanUnion()`
+  method to `com.maxmind.geoip2.record.Country` and
+  `com.maxmind.minfraud.response.GeoIp2Country`. This returns `true` if the
+  country is a member state of the European Union.
 * The web service client now correctly handles a proxy of `Proxy.NO_PROXY`.
   PR by Ernest Sadykov. GitHub #32.
 * The following payment processors were added to the `Payment.Processor` enum:

src/main/java/com/maxmind/minfraud/response/GeoIp2Country.java

@@ -14,20 +14,35 @@
 public final class GeoIp2Country extends Country {
     private final boolean isHighRisk;
 
+    // This method is for backwards compatibility. We should remove it when we
+    // do a major release.
+    public GeoIp2Country(
+            List<String> locales,
+            Integer confidence,
+            Integer geoNameId,
+            boolean isHighRisk,
+            String isoCode,
+            Map<String, String> names
+    ) {
+        this(locales, confidence, geoNameId, isHighRisk, false, isoCode, names);
+    }
+
     public GeoIp2Country(
             @JacksonInject("locales") List<String> locales,
             @JsonProperty("confidence") Integer confidence,
             @JsonProperty("geoname_id") Integer geoNameId,
             @JsonProperty("is_high_risk") boolean isHighRisk,
+            @JsonProperty("is_in_european_union") boolean isInEuropeanUnion,
             @JsonProperty("iso_code") String isoCode,
             @JsonProperty("names") Map<String, String> names
     ) {
-        super(locales, confidence, geoNameId, isoCode, names);
+        super(locales, confidence, geoNameId, isInEuropeanUnion, isoCode,
+                names);
         this.isHighRisk = isHighRisk;
     }
 
     public GeoIp2Country() {
-        this(null, null, null, false, null, null);
+        this(null, null, null, false, false, null, null);
     }
 
     /**

src/test/java/com/maxmind/minfraud/WebServiceClientTest.java

@@ -22,6 +22,8 @@
 import static com.jcabi.matchers.RegexMatchers.matchesPattern;
 import static com.maxmind.minfraud.request.RequestTestHelper.*;
 import static org.hamcrest.core.StringStartsWith.startsWith;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(JUnitParamsRunner.class)
 public class WebServiceClientTest {
@@ -68,6 +70,15 @@ public void testFullInsightsTransaction() throws Exception {
             // We cannot change this as it would be a breaking change to the GeoIP2 API.
             JSONAssert.assertEquals(responseContent, response.toJson(), false);
             verifyRequestFor("insights", "full-request");
+            assertTrue(
+                    "response.getIpAddress().getCountry().isInEuropeanUnion() does not return true",
+                    response.getIpAddress().getCountry().isInEuropeanUnion());
+            assertFalse(
+                    "response.getIpAddress().getRegisteredCountry().isInEuropeanUnion() does not return false",
+                    response.getIpAddress().getRegisteredCountry().isInEuropeanUnion());
+            assertTrue(
+                    "response.getIpAddress().getRepresentedCountry().isInEuropeanUnion() does not return true",
+                    response.getIpAddress().getRepresentedCountry().isInEuropeanUnion());
         }
     }
 
@@ -83,6 +94,15 @@ public void testFullFactorsTransaction() throws Exception {
             // We cannot change this as it would be a breaking change to the GeoIP2 API.
             JSONAssert.assertEquals(responseContent, response.toJson(), false);
             verifyRequestFor("factors", "full-request");
+            assertTrue(
+                    "response.getIpAddress().getCountry().isInEuropeanUnion() does not return true",
+                    response.getIpAddress().getCountry().isInEuropeanUnion());
+            assertTrue(
+                    "response.getIpAddress().getRegisteredCountry().isInEuropeanUnion() does not return true",
+                    response.getIpAddress().getRegisteredCountry().isInEuropeanUnion());
+            assertFalse(
+                    "response.getIpAddress().getRepresentedCountry().isInEuropeanUnion() does not return false",
+                    response.getIpAddress().getRepresentedCountry().isInEuropeanUnion());
         }
     }
 

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

@@ -36,6 +36,7 @@
       "confidence": 99,
       "geoname_id": 2635167,
       "is_high_risk": false,
+      "is_in_european_union": true,
       "iso_code": "GB",
       "names": {
         "de": "Vereinigtes K\u00f6nigreich",
@@ -56,17 +57,18 @@
       "time_zone": "Europe\/London"
     },
     "registered_country": {
-      "geoname_id": 6252001,
-      "iso_code": "US",
+      "geoname_id": 2635167,
+      "is_in_european_union": true,
+      "iso_code": "GB",
       "names": {
-        "de": "USA",
-        "en": "United States",
-        "es": "Estados Unidos",
-        "fr": "\u00c9tats-Unis",
-        "ja": "\u30a2\u30e1\u30ea\u30ab\u5408\u8846\u56fd",
-        "pt-BR": "Estados Unidos",
-        "ru": "\u0421\u0428\u0410",
-        "zh-CN": "\u7f8e\u56fd"
+        "de": "Vereinigtes K\u00f6nigreich",
+        "en": "United Kingdom",
+        "es": "Reino Unido",
+        "fr": "Royaume-Uni",
+        "ja": "\u30a4\u30ae\u30ea\u30b9",
+        "pt-BR": "Reino Unido",
+        "ru": "\u0412\u0435\u043b\u0438\u043a\u043e\u0431\u0440\u0438\u0442\u0430\u043d\u0438\u044f",
+        "zh-CN": "\u82f1\u56fd"
       }
     },
     "subdivisions": [

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

@@ -36,6 +36,7 @@
       "confidence": 99,
       "geoname_id": 2635167,
       "is_high_risk": false,
+      "is_in_european_union": true,
       "iso_code": "GB",
       "names": {
         "de": "Vereinigtes K\u00f6nigreich",
@@ -69,6 +70,21 @@
         "zh-CN": "\u7f8e\u56fd"
       }
     },
+    "represented_country": {
+      "geoname_id": 2635167,
+      "is_in_european_union": true,
+      "iso_code": "GB",
+      "names": {
+        "de": "Vereinigtes K\u00f6nigreich",
+        "en": "United Kingdom",
+        "es": "Reino Unido",
+        "fr": "Royaume-Uni",
+        "ja": "\u30a4\u30ae\u30ea\u30b9",
+        "pt-BR": "Reino Unido",
+        "ru": "\u0412\u0435\u043b\u0438\u043a\u043e\u0431\u0440\u0438\u0442\u0430\u043d\u0438\u044f",
+        "zh-CN": "\u82f1\u56fd"
+      }
+    },
     "subdivisions": [
       {
         "confidence": 42,