Merge pull request #33 from ipinfo/umar/isEU

added isEU

Author: UmanShahzad

README.md

@@ -175,6 +175,40 @@ This file must follow the same layout as seen [here](https://github.com/ipinfo/j
 
 More language files can be found [here](https://country.io/data)
 
+#### EU Country Lookup
+
+This library provides a system to lookup if a country is a member of the European Union (EU) through 
+ISO2 country codes.
+
+By default, [here](https://github.com/ipinfo/java-ipinfo/blob/master/src/main/resources/eu.json) is the file containing all the EU members. 
+If you wish to provide a different file, just use the following system in the builder:
+
+```java
+import io.ipinfo.api.IPinfo;
+import io.ipinfo.api.errors.RateLimitedException;
+import io.ipinfo.api.model.IPResponse;
+
+public class Main {
+    public static void main(String... args) {
+        IPinfo ipInfo = new IPinfo.Builder()
+                .setToken("YOUR TOKEN")
+                .setEUCountryFile(new File("path/to/file.json"))
+                .build();
+
+        try {
+            IPResponse response = ipInfo.lookupIP("8.8.8.8");
+
+            // Print out whether the country is a member of the EU
+            System.out.println(response.isEU());
+        } catch (RateLimitedException ex) {
+            // Handle rate limits here.
+        }
+    }
+}
+```
+
+This file must follow the same layout as seen [here](https://github.com/ipinfo/java-ipinfo/blob/master/src/main/resources/eu.json)
+
 #### Location Information
 
 This library provides an easy way to get the latitude and longitude of an IP Address:

src/main/java/io/ipinfo/api/IPinfo.java

@@ -360,6 +360,8 @@ public static String cacheKey(String k) {
     public static class Builder {
         private File countryFile =
                 new File(this.getClass().getClassLoader().getResource("en_US.json").getFile());
+        private File euCountryFile =
+                new File(this.getClass().getClassLoader().getResource("eu.json").getFile());
         private OkHttpClient client = new OkHttpClient.Builder().build();
         private String token = "";
         private Cache cache = new SimpleCache(Duration.ofDays(1));
@@ -379,23 +381,32 @@ public Builder setCountryFile(File file) {
             return this;
         }
 
+        public Builder setEUCountryFile(File file) {
+            this.euCountryFile = file;
+            return this;
+        }
+
         public Builder setCache(Cache cache) {
             this.cache = cache;
             return this;
         }
 
         public IPinfo build() {
             Type type = new TypeToken<Map<String, String>>(){}.getType();
+            Type euCountriesType = new TypeToken<List<String>>(){}.getType();
             Gson gson = new Gson();
             Map<String, String> map;
+            List<String> euList;
 
             try {
                 map = Collections.unmodifiableMap(gson.fromJson(new FileReader(countryFile), type));
+                euList = Collections.unmodifiableList(gson.fromJson(new FileReader(euCountryFile), euCountriesType));
             } catch (Exception e) {
                 map = Collections.unmodifiableMap(new HashMap<>());
+                euList = Collections.unmodifiableList(new ArrayList<>());
             }
 
-            return new IPinfo(client, new Context(map), token, cache);
+            return new IPinfo(client, new Context(map, euList), token, cache);
         }
     }
 

src/main/java/io/ipinfo/api/context/Context.java

@@ -1,15 +1,22 @@
 package io.ipinfo.api.context;
 
+import java.util.List;
 import java.util.Map;
 
 public class Context {
     private final Map<String, String> countryMap;
+    private final List<String> euCountries;
 
-    public Context(Map<String, String> countryMap) {
+    public Context(Map<String, String> countryMap, List<String> euCountries) {
         this.countryMap = countryMap;
+        this.euCountries = euCountries;
     }
 
     public String getCountryName(String countryCode) {
         return countryMap.get(countryCode);
     }
+
+    public boolean isEU(String countryCode) {
+        return euCountries.contains(countryCode);
+    }
 }

src/main/java/io/ipinfo/api/model/IPResponse.java

@@ -95,6 +95,10 @@ public String getCountryName() {
         return context.getCountryName(getCountryCode());
     }
 
+    public Boolean isEU() {
+        return context.isEU(getCountryCode());
+    }
+
     public String getLocation() {
         return loc;
     }

src/main/resources/eu.json

@@ -0,0 +1 @@
+["IE","AT","LT","LU","LV","DE","DK","SE","SI","SK","CZ","CY","NL","FI","FR","MT","ES","IT","EE","PL","PT","HU","HR","GR","RO","BG","BE"]

src/test/java/io/ipinfo/IPinfoTest.java

@@ -33,6 +33,7 @@ public void testGoogleDNS() {
                     () -> assertEquals(response.getRegion(), "California"),
                     () -> assertEquals(response.getCountryCode(), "US"),
                     () -> assertEquals(response.getCountryName(), "United States"),
+                    () -> assertFalse(response.isEU()),
                     () -> assertEquals(response.getTimezone(), "America/Los_Angeles"),
                     () -> assertFalse(response.getPrivacy().getProxy()),
                     () -> assertFalse(response.getPrivacy().getVpn()),