update version 1.0.11

Author: ahsannawaz111

README.md

@@ -35,7 +35,7 @@ Add the following dependency in 'pom.xml' file to use the IP Geolocation API Jav
 <dependency>
     <groupId>io.ipgeolocation</groupId>
     <artifactId>ipgeolocation</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.11</version>
 </dependency>
 ```
 
@@ -50,7 +50,7 @@ repositories {
 }
 
 dependencies {
-    compile 'io.ipgeolocation:ipgeolocation:1.0.9'
+    compile 'io.ipgeolocation:ipgeolocation:1.0.11'
     ...
 }
 ```
@@ -60,7 +60,7 @@ dependencies {
 Add the following dependency code in 'ivy.xml' file to use the IP Geolocation API Java SDK.
 
 ```ivy
-<dependency org='io.ipgeolocation' name='ipgeolocation' rev='1.0.9'>
+<dependency org='io.ipgeolocation' name='ipgeolocation' rev='1.0.11'>
     <artifact name='ipgeolocation' />
 </dependency>
 ```
@@ -69,7 +69,7 @@ Add the following dependency code in 'ivy.xml' file to use the IP Geolocation AP
 
 Use the following URL to download the latest JAR file for IP Geolocation API Java SDK.
 
-* [https://ipgeolocation.io/downloads/ip-geolocation-api-java-1.0.9.jar](https://ipgeolocation.io/downloads/ip-geolocation-api-java-1.0.9.jar)
+* [https://ipgeolocation.io/downloads/ip-geolocation-api-java-1.0.11.jar](https://ipgeolocation.io/downloads/ip-geolocation-api-java-1.0.11.jar)
 
 Basic Usage
 -----------
@@ -88,14 +88,20 @@ IPGeolocationAPI api = new IPGeolocationAPI("YOUR_API_KEY");
 GeolocationParams geoParams = new GeolocationParams();
 geoParams.setIPAddress("1.1.1.1");
 geoParams.setFields("geo,time_zone,currency");
-
+geoParams.setIncludeSecurity(true);
 Geolocation geolocation = api.getGeolocation(geoParams);
 
 // Check if geolocation lookup was successful
 if(geolocation.getStatus() == 200) {
     System.out.println(geolocation.getCountryName());
     System.out.println(geolocation.getCurrency().getName());
     System.out.println(geolocation.getTimezone().getCurrentTime());
+    System.out.println(geolocation.getGeolocationSecurity().getAnonymous());
+    System.out.println(geolocation.getGeolocationSecurity().getKnownAttacker());
+    System.out.println(geolocation.getGeolocationSecurity().getProxy());
+    System.out.println(geolocation.getGeolocationSecurity().getProxyType());
+    System.out.println(geolocation.getGeolocationSecurity().getAnonymous());
+    System.out.println(geolocation.getGeolocationSecurity().getCloudProvider());
 } else {
     System.out.printf("Status Code: %d, Message: %s\n", geolocation.getStatus(), geolocation.getMessage());
 }

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.ipgeolocation</groupId>
     <artifactId>ipgeolocation</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.11</version>
 
     <dependencies>
         <dependency>

src/main/java/io/ipgeolocation/api/Geolocation.java

@@ -34,6 +34,7 @@ public class Geolocation {
     private String geonameID;
     private GeolocationCurrency currency;
     private GeolocationTimezone timezone;
+    private GeolocationSecurity geolocationSecurity;
 
     Geolocation(Map<String, Object> json) {
         this.status = Integer.parseInt((String) json.get("status"));
@@ -76,6 +77,11 @@ public class Geolocation {
                 Map timezoneJson = (LinkedTreeMap) json.get("time_zone");
                 this.timezone = new GeolocationTimezone(timezoneJson);
             }
+
+            if(json.get("security") instanceof LinkedTreeMap) {
+                Map securityJson = (LinkedTreeMap) json.get("security");
+                this.geolocationSecurity = new GeolocationSecurity(securityJson);
+            }
         }
     }
 
@@ -195,10 +201,15 @@ public GeolocationTimezone getTimezone() {
         return timezone;
     }
 
+    public GeolocationSecurity getGeolocationSecurity() {
+        return geolocationSecurity;
+    }
+
     @Override
     public String toString() {
         String currencyString = "";
         String timezoneString = "";
+        String geolocationSecurityString = "";
 
         if(currency != null) {
             currencyString = currency.toString();
@@ -208,6 +219,10 @@ public String toString() {
             timezoneString = timezone.toString();
         }
 
-        return String.format("domain: '%s' \nip: '%s' \nhostname: '%s' \ncontinent_code: '%s' \ncontinent_name: '%s' \ncountry_code2: '%s' \ncountry_code3: '%s' \ncountry_name: '%s' \ncountry_capital: '%s \nstate_prov: '%s' \ndistrict: '%s' \ncity: '%s' \nzipcode: '%s' \nlatitude: '%s' \nlongitude: '%s' \nis_eu: '%s' \ncalling_code: '%s' \ncountry_tld: '%s' \nlanguages: '%s' \ncountry_flag: '%s' \nisp: '%s' \nconnection_type: '%s' \norganization: '%s' \ngeoname_id: '%s'\nasn: '%s' \ncurrency: {\n%s\n} \ntime_zone: {\n%s\n}\n", domain, ip, hostname, continentCode, continentName, countryCode2, countryCode3, countryName, countryCapital, stateProvince, district, city, zipCode, latitude, longitude, isEU, callingCode, countryTLD, languages, countryFlag, isp, connectionType, organization, geonameID, asn, currencyString, timezoneString);
+        if(geolocationSecurity != null){
+            geolocationSecurityString = geolocationSecurity.toString();
+        }
+
+        return String.format("domain: '%s' \nip: '%s' \nhostname: '%s' \ncontinent_code: '%s' \ncontinent_name: '%s' \ncountry_code2: '%s' \ncountry_code3: '%s' \ncountry_name: '%s' \ncountry_capital: '%s \nstate_prov: '%s' \ndistrict: '%s' \ncity: '%s' \nzipcode: '%s' \nlatitude: '%s' \nlongitude: '%s' \nis_eu: '%s' \ncalling_code: '%s' \ncountry_tld: '%s' \nlanguages: '%s' \ncountry_flag: '%s' \nisp: '%s' \nconnection_type: '%s' \norganization: '%s' \ngeoname_id: '%s'\nasn: '%s' \ncurrency: {\n%s\n} \ntime_zone: {\n%s\n} \nsecurity: {\n%s\n}\n", domain, ip, hostname, continentCode, continentName, countryCode2, countryCode3, countryName, countryCapital, stateProvince, district, city, zipCode, latitude, longitude, isEU, callingCode, countryTLD, languages, countryFlag, isp, connectionType, organization, geonameID, asn, currencyString, timezoneString, geolocationSecurityString);
     }
 }

src/main/java/io/ipgeolocation/api/GeolocationParams.java

@@ -7,13 +7,15 @@ public class GeolocationParams {
     private String fields;
     private String lang;
     private boolean includeHostname;
+    private boolean includeSecurity;
     private String[] ips;
 
     public GeolocationParams() {
         this.ip = "";
         this.fields = "";
         this.lang = "en";
         this.includeHostname = false;
+        this.includeSecurity = false;
         this.ips = new String[0];
     }
 
@@ -49,6 +51,14 @@ public boolean isIncludeHostname() {
         return includeHostname;
     }
 
+    public boolean isIncludeSecurity() {
+        return includeSecurity;
+    }
+
+    public void setIncludeSecurity(boolean includeSecurity) {
+        this.includeSecurity = includeSecurity;
+    }
+
     public void setIPAddresses(String[] ips) throws IllegalArgumentException {
         if(ips.length > 50) {
             throw new IllegalArgumentException("Max. number of IP addresses cannot be more than 50.");

src/main/java/io/ipgeolocation/api/GeolocationSecurity.java

@@ -0,0 +1,79 @@
+package io.ipgeolocation.api;
+
+import java.util.Map;
+
+public class GeolocationSecurity {
+    private Double threatScore;
+    private Boolean isTor;
+    private Boolean isProxy;
+    private String proxyType;
+    private Boolean isAnonymous;
+    private Boolean isKnownAttacker;
+    private Boolean isCloudProvider;
+
+    GeolocationSecurity(Map json){
+        this.threatScore = (Double) json.get("threat_score");
+        this.isTor = (Boolean) json.get("is_tor");
+        this.isProxy = (Boolean) json.get("is_proxy");
+        this.proxyType = (String) json.get("proxy_type");
+        this.isAnonymous = (Boolean) json.get("is_anonymous");
+        this.isKnownAttacker = (Boolean) json.get("is_known_attacker");
+        this.isCloudProvider = (Boolean) json.get("is_cloud_provider");
+    }
+
+    public Double getThreatScore() {
+        return threatScore;
+    }
+
+    public void setThreatScore(Double threatScore) {
+        this.threatScore = threatScore;
+    }
+
+    public Boolean getTor() {
+        return isTor;
+    }
+
+    public void setTor(Boolean tor) {
+        isTor = tor;
+    }
+
+    public Boolean getProxy() {
+        return isProxy;
+    }
+
+    public void setProxy(Boolean proxy) {
+        isProxy = proxy;
+    }
+
+    public String getProxyType() {
+        return proxyType;
+    }
+
+    public void setProxyType(String proxyType) {
+        this.proxyType = proxyType;
+    }
+
+    public Boolean getAnonymous() {
+        return isAnonymous;
+    }
+
+    public void setAnonymous(Boolean anonymous) {
+        isAnonymous = anonymous;
+    }
+
+    public Boolean getKnownAttacker() {
+        return isKnownAttacker;
+    }
+
+    public void setKnownAttacker(Boolean knownAttacker) {
+        isKnownAttacker = knownAttacker;
+    }
+
+    public Boolean getCloudProvider() {
+        return isCloudProvider;
+    }
+
+    public void setCloudProvider(Boolean cloudProvider) {
+        isCloudProvider = cloudProvider;
+    }
+}

src/main/java/io/ipgeolocation/api/IPGeolocationAPI.java

@@ -59,6 +59,14 @@ private String buildGeolocationUrlParams(GeolocationParams params) {
                 urlParams.append("&include=hostname");
             }
 
+            if(params.isIncludeSecurity()) {
+                if(params.isIncludeHostname()){
+                    urlParams.append(",security");
+                }else{
+                    urlParams.append("&include=security");
+                }
+            }
+
             if(!isNullOrEmpty(params.getLang())) {
                 urlParams.append("&lang=");
                 urlParams.append(params.getLang());