Apply automated reformatting

Author: oschwald

CHANGELOG.md

@@ -137,8 +137,8 @@ CHANGELOG
 -------------------
 
 * The following new anonymizer methods were added to
- `com.maxmind.geoip2.record.Traits` for use with GeoIP2 Precision Insights:
- `isAnonymous()`, `isAnonymousVpn()`, `isHostingProvider()`, `isPublicProxy()`,
+  `com.maxmind.geoip2.record.Traits` for use with GeoIP2 Precision Insights:
+  `isAnonymous()`, `isAnonymousVpn()`, `isHostingProvider()`, `isPublicProxy()`,
   and `isTorExitNode()`.
 
 2.9.0 (2017-05-08)

README.md

@@ -190,7 +190,7 @@ object.
 
 After you have created the `DatabaseReader`, you may then call one of the
 appropriate methods, e.g., `city` or `tryCity`, for your database. These
-methods take the IP address to be looked up.  The methods with the `try`
+methods take the IP address to be looked up. The methods with the `try`
 prefix return an `Optional` object, which will be empty if the value is
 not present in the database. The method without the prefix will throw an
 `AddressNotFoundException` if the address is not in the database. If you
@@ -437,7 +437,8 @@ following:
 
 * `com.maxmind.geoip2.record.City` - `City.getGeoNameId`
 * `com.maxmind.geoip2.record.Continent` - `Continent.getCode` or `Continent.getGeoNameId`
-* `com.maxmind.geoip2.record.Country` and `com.maxmind.geoip2.record.RepresentedCountry` - `Country.getIsoCode` or `Country.getGeoNameId`
+* `com.maxmind.geoip2.record.Country` and `com.maxmind.geoip2.record.RepresentedCountry` - `Country.getIsoCode`
+  or `Country.getGeoNameId`
 * `com.maxmind.geoip2.record.Subdivision` - `Subdivision.getIsoCode` or `Subdivision.getGeoNameId`
 
 ## Multi-Threaded Use ##

sample/Benchmark.java

@@ -31,16 +31,20 @@ public static void main(String[] args) throws GeoIp2Exception, IOException {
         loop("Benchmarking", file, BENCHMARKS, new CHMCache());
     }
 
-    private static void loop(String msg, File file, int loops, NodeCache cache) throws GeoIp2Exception, IOException {
+    private static void loop(String msg, File file, int loops, NodeCache cache)
+        throws GeoIp2Exception, IOException {
         System.out.println(msg);
         for (int i = 0; i < loops; i++) {
-            DatabaseReader r = new DatabaseReader.Builder(file).fileMode(FileMode.MEMORY_MAPPED).withCache(cache).build();
+            DatabaseReader r =
+                new DatabaseReader.Builder(file).fileMode(FileMode.MEMORY_MAPPED).withCache(cache)
+                    .build();
             bench(r, COUNT, i);
         }
         System.out.println();
     }
 
-    private static void bench(DatabaseReader r, int count, int seed) throws GeoIp2Exception, UnknownHostException {
+    private static void bench(DatabaseReader r, int count, int seed)
+        throws GeoIp2Exception, UnknownHostException {
         Random random = new Random(seed);
         long startTime = System.nanoTime();
         byte[] address = new byte[4];

src/main/java/com/maxmind/geoip2/DatabaseProvider.java

@@ -1,8 +1,15 @@
 package com.maxmind.geoip2;
 
 import com.maxmind.geoip2.exception.GeoIp2Exception;
-import com.maxmind.geoip2.model.*;
-
+import com.maxmind.geoip2.model.AnonymousIpResponse;
+import com.maxmind.geoip2.model.AsnResponse;
+import com.maxmind.geoip2.model.CityResponse;
+import com.maxmind.geoip2.model.ConnectionTypeResponse;
+import com.maxmind.geoip2.model.CountryResponse;
+import com.maxmind.geoip2.model.DomainResponse;
+import com.maxmind.geoip2.model.EnterpriseResponse;
+import com.maxmind.geoip2.model.IpRiskResponse;
+import com.maxmind.geoip2.model.IspResponse;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Optional;
@@ -16,7 +23,7 @@ public interface DatabaseProvider extends GeoIp2Provider {
      * @throws IOException     if there is an IO error
      */
     Optional<CountryResponse> tryCountry(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * @param ipAddress IPv4 or IPv6 address to lookup.
@@ -25,7 +32,7 @@ Optional<CountryResponse> tryCountry(InetAddress ipAddress) throws IOException,
      * @throws IOException     if there is an IO error
      */
     Optional<CityResponse> tryCity(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Anonymous IP.
@@ -36,7 +43,7 @@ Optional<CityResponse> tryCity(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     AnonymousIpResponse anonymousIp(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Anonymous IP.
@@ -47,10 +54,10 @@ AnonymousIpResponse anonymousIp(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<AnonymousIpResponse> tryAnonymousIp(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
 
-     /**
+    /**
      * Look up an IP address in a GeoIP2 IP Risk database.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
@@ -59,18 +66,18 @@ Optional<AnonymousIpResponse> tryAnonymousIp(InetAddress ipAddress) throws IOExc
      * @throws java.io.IOException                          if there is an IO error
      */
     IpRiskResponse ipRisk(InetAddress ipAddress) throws IOException,
-    GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
-    * Look up an IP address in a GeoIP2 IP Risk database.
-    *
-    * @param ipAddress IPv4 or IPv6 address to lookup.
-    * @return an IPRiskResponse for the requested IP address or empty if the IP address is not in the DB.
-    * @throws com.maxmind.geoip2.exception.GeoIp2Exception if there is an error looking up the IP
-    * @throws java.io.IOException                          if there is an IO error
-    */
+     * Look up an IP address in a GeoIP2 IP Risk database.
+     *
+     * @param ipAddress IPv4 or IPv6 address to lookup.
+     * @return an IPRiskResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @throws com.maxmind.geoip2.exception.GeoIp2Exception if there is an error looking up the IP
+     * @throws java.io.IOException                          if there is an IO error
+     */
     Optional<IpRiskResponse> tryIpRisk(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoLite2 ASN database.
@@ -81,7 +88,7 @@ Optional<IpRiskResponse> tryIpRisk(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     AsnResponse asn(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoLite2 ASN database.
@@ -92,7 +99,7 @@ AsnResponse asn(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<AsnResponse> tryAsn(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Connection Type database.
@@ -103,7 +110,7 @@ Optional<AsnResponse> tryAsn(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     ConnectionTypeResponse connectionType(InetAddress ipAddress)
-            throws IOException, GeoIp2Exception;
+        throws IOException, GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Connection Type database.
@@ -114,7 +121,7 @@ ConnectionTypeResponse connectionType(InetAddress ipAddress)
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<ConnectionTypeResponse> tryConnectionType(InetAddress ipAddress)
-            throws IOException, GeoIp2Exception;
+        throws IOException, GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Domain database.
@@ -125,7 +132,7 @@ Optional<ConnectionTypeResponse> tryConnectionType(InetAddress ipAddress)
      * @throws java.io.IOException                          if there is an IO error
      */
     DomainResponse domain(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Domain database.
@@ -136,7 +143,7 @@ DomainResponse domain(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<DomainResponse> tryDomain(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Enterprise database.
@@ -147,7 +154,7 @@ Optional<DomainResponse> tryDomain(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     EnterpriseResponse enterprise(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 Enterprise database.
@@ -158,7 +165,7 @@ EnterpriseResponse enterprise(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<EnterpriseResponse> tryEnterprise(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 ISP database.
@@ -169,7 +176,7 @@ Optional<EnterpriseResponse> tryEnterprise(InetAddress ipAddress) throws IOExcep
      * @throws java.io.IOException                          if there is an IO error
      */
     IspResponse isp(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 
     /**
      * Look up an IP address in a GeoIP2 ISP database.
@@ -180,5 +187,5 @@ IspResponse isp(InetAddress ipAddress) throws IOException,
      * @throws java.io.IOException                          if there is an IO error
      */
     Optional<IspResponse> tryIsp(InetAddress ipAddress) throws IOException,
-            GeoIp2Exception;
+        GeoIp2Exception;
 }