Manual Checkstyle fixes

Author: oschwald

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

@@ -18,7 +18,7 @@ public interface DatabaseProvider extends GeoIp2Provider {
 
     /**
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return A Country model for the requested IP address or empty if the IP address is not in the DB.
+     * @return A Country model for the requested IP address or empty if it is not in the DB.
      * @throws GeoIp2Exception if there is an error looking up the IP
      * @throws IOException     if there is an IO error
      */
@@ -27,7 +27,7 @@ Optional<CountryResponse> tryCountry(InetAddress ipAddress) throws IOException,
 
     /**
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return A City model for the requested IP address or empty if the IP address is not in the DB.
+     * @return A City model for the requested IP address or empty if it is not in the DB.
      * @throws GeoIp2Exception if there is an error looking up the IP
      * @throws IOException     if there is an IO error
      */
@@ -49,7 +49,7 @@ AnonymousIpResponse anonymousIp(InetAddress ipAddress) throws IOException,
      * Look up an IP address in a GeoIP2 Anonymous IP.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return a AnonymousIpResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @return a AnonymousIpResponse for the requested IP address or empty if it 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
      */
@@ -72,7 +72,7 @@ IpRiskResponse ipRisk(InetAddress ipAddress) throws IOException,
      * 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.
+     * @return an IPRiskResponse for the requested IP address or empty if it 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
      */
@@ -94,7 +94,7 @@ AsnResponse asn(InetAddress ipAddress) throws IOException,
      * Look up an IP address in a GeoLite2 ASN database.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return an IspResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @return an IspResponse for the requested IP address or empty if it 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
      */
@@ -116,7 +116,7 @@ ConnectionTypeResponse connectionType(InetAddress ipAddress)
      * Look up an IP address in a GeoIP2 Connection Type database.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return a ConnectTypeResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @return a ConnectTypeResponse for the requested IP address or empty if it 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
      */
@@ -138,7 +138,7 @@ DomainResponse domain(InetAddress ipAddress) throws IOException,
      * Look up an IP address in a GeoIP2 Domain database.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return a DomainResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @return a DomainResponse for the requested IP address or empty if it 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
      */
@@ -160,7 +160,7 @@ EnterpriseResponse enterprise(InetAddress ipAddress) throws IOException,
      * Look up an IP address in a GeoIP2 Enterprise database.
      *
      * @param ipAddress IPv4 or IPv6 address to lookup.
-     * @return an EnterpriseResponse for the requested IP address or empty if the IP address is not in the DB.
+     * @return an EnterpriseResponse for the requested IP address or empty if it 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
      */
@@ -181,7 +181,7 @@ IspResponse isp(InetAddress ipAddress) throws IOException,
     /**
      * Look up an IP address in a GeoIP2 ISP database.
      *
-     * @param ipAddress IPv4 or IPv6 address to look up or empty if the IP address is not in the DB.
+     * @param ipAddress IPv4 or IPv6 address to look up or empty if it is not in the DB.
      * @return an IspResponse for the requested IP address.
      * @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

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

@@ -211,9 +211,9 @@ public Builder withCache(NodeCache cache) {
         /**
          * @param val The file mode used to open the GeoIP2 database
          * @return Builder object
-         * @throws java.lang.IllegalArgumentException if you initialized the Builder with a URL, which uses
-         *                                            {@link FileMode#MEMORY}, but you provided a different
-         *                                            FileMode to this method.
+         * @throws java.lang.IllegalArgumentException if you initialized the Builder with a URL,
+         *                                            which uses {@link FileMode#MEMORY}, but you
+         *                                            provided a different FileMode to this method.
          */
         public Builder fileMode(FileMode val) {
             if (this.stream != null && FileMode.MEMORY != val) {
@@ -262,7 +262,7 @@ Network getNetwork() {
      * @param ipAddress    IPv4 or IPv6 address to lookup.
      * @param cls          The class to deserialize to.
      * @param expectedType The expected database type.
-     * @return A LookupResult<T> object with the data for the IP address
+     * @return A {@code LookupResult<T>} object with the data for the IP address
      * @throws IOException if there is an error opening or reading from the file.
      */
     private <T> LookupResult<T> get(InetAddress ipAddress, Class<T> cls,

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

@@ -129,10 +129,8 @@ private WebServiceClient(Builder builder) {
         // HttpClient supports basic auth, but it will only send it after the
         // server responds with an unauthorized. As such, we just make the
         // Authorization header ourselves.
-        this.authHeader = "Basic " +
-            Base64.getEncoder()
-                .encodeToString((builder.accountId + ":" + builder.licenseKey)
-                    .getBytes(StandardCharsets.UTF_8));
+        this.authHeader = "Basic " + Base64.getEncoder().encodeToString(
+            (builder.accountId + ":" + builder.licenseKey).getBytes(StandardCharsets.UTF_8));
 
         mapper = JsonMapper.builder()
             .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
@@ -156,7 +154,8 @@ private WebServiceClient(Builder builder) {
      * with the {@code Builder}:
      * </p>
      * <p>
-     * {@code WebServiceClient client = new WebServiceClient.Builder(12,"licensekey").host("geoip.maxmind.com").build();}
+     * {@code WebServiceClient client = new WebServiceClient.Builder(12,"licensekey")
+     *      .host("geoip.maxmind.com").build();}
      * </p>
      * <p>
      * Only the values set in the {@code Builder} constructor are required.
@@ -208,8 +207,8 @@ public Builder connectTimeout(Duration val) {
         }
 
         /**
-         * Disables HTTPS to connect to a test server or proxy. The minFraud ScoreResponse and InsightsResponse web services require
-         * HTTPS.
+         * Disables HTTPS to connect to a test server or proxy. The minFraud ScoreResponse and
+         * InsightsResponse web services require HTTPS.
          *
          * @return Builder object
          */
@@ -456,10 +455,10 @@ private static void handleErrorWithJsonBody(Map<String, String> content,
                 throw new OutOfQueriesException(error);
             case "PERMISSION_REQUIRED":
                 throw new PermissionRequiredException(error);
+            default:
+                // These should be fairly rare
+                throw new InvalidRequestException(error, code, uri);
         }
-
-        // These should be fairly rare
-        throw new InvalidRequestException(error, code, uri);
     }
 
     private URI createUri(String service, InetAddress ipAddress) throws GeoIp2Exception {
@@ -504,15 +503,15 @@ public void close() throws IOException {
 
     @Override
     public String toString() {
-        return "WebServiceClient{" +
-            "host='" + host + '\'' +
-            ", locales=" + locales +
-            ", useHttps=" + useHttps +
-            ", port=" + port +
-            ", requestTimeout=" + requestTimeout +
-            ", userAgent='" + userAgent + '\'' +
-            ", mapper=" + mapper +
-            ", httpClient=" + httpClient +
-            '}';
+        return "WebServiceClient{"
+            + "host='" + host + '\''
+            + ", locales=" + locales
+            + ", useHttps=" + useHttps
+            + ", port=" + port
+            + ", requestTimeout=" + requestTimeout
+            + ", userAgent='" + userAgent + '\''
+            + ", mapper=" + mapper
+            + ", httpClient=" + httpClient
+            + '}';
     }
 }