Merge pull request #528 from maxmind/greg/eng-2665

Require Java 17+

Author: horgh

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         distribution: ['zulu']
         os: [ubuntu-latest, windows-latest, macos-latest]
-        version: [ 11, 17, 21, 22 ]
+        version: [ 17, 21, 24 ]
     steps:
       - uses: actions/checkout@v5
         with:

CHANGELOG.md

@@ -1,6 +1,20 @@
 CHANGELOG
 =========
 
+4.0.0
+------------------
+
+* BREAKING: Removed deprecated `TransactionReport.Builder(InetAddress, Tag)`
+  constructor. Use `Builder(Tag)` and `ipAddress(InetAddress)` instead.
+* BREAKING: Removed deprecated `getUrl()` methods from `HttpException` and
+  `InvalidRequestException`. Use `getUri()` instead.
+* BREAKING: Removed deprecated constructors from `FactorsResponse`,
+  `InsightsResponse`, and `Phone` classes.
+* BREAKING: Removed deprecated `Subscores` class and
+  `FactorsResponse.getSubscores()` method. Use `getRiskScoreReasons()`
+  instead.
+* BREAKING: Java 17 is now required (previously Java 11).
+
 3.9.0
 ------------------
 

README.md

@@ -16,7 +16,7 @@ To do this, add the dependency to your pom.xml:
     <dependency>
         <groupId>com.maxmind.minfraud</groupId>
         <artifactId>minfraud</artifactId>
-        <version>3.8.0</version>
+        <version>4.0.0</version>
     </dependency>
 ```
 
@@ -29,7 +29,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile 'com.maxmind.minfraud:minfraud:3.8.0'
+    compile 'com.maxmind.minfraud:minfraud:4.0.0'
 }
 ```
 
@@ -281,7 +281,7 @@ to the client API, please see
 
 ## Requirements ##
 
-This code requires Java 11+.
+This code requires Java 17+.
 
 ## Contributing ##
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.maxmind.minfraud</groupId>
     <artifactId>minfraud</artifactId>
-    <version>3.8.0</version>
+    <version>4.0.0</version>
     <name>MaxMind minFraud API</name>
     <description>MaxMind minFraud Score, Insights, Factors and Report Transaction API</description>
     <url>http://dev.maxmind.com/minfraud</url>
@@ -170,7 +170,7 @@
                 <version>3.11.3</version>
                 <configuration>
                     <show>public</show>
-                    <source>11</source>
+                    <source>17</source>
                     <doclint>-missing</doclint>
                 </configuration>
                 <executions>
@@ -206,9 +206,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
                 <configuration>
-                    <release>11</release>
-                    <source>1.11</source>
-                    <target>1.11</target>
+                    <release>17</release>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -24,7 +24,6 @@
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
@@ -168,7 +167,7 @@ public WebServiceClient.Builder locales(List<String> val) {
             if (locales == null) {
                 throw new IllegalArgumentException("locales must not be null");
             }
-            locales = new ArrayList<>(val);
+            locales = List.copyOf(val);
             return this;
         }
 
@@ -436,17 +435,11 @@ private void handleErrorWithJsonBody(Map<String, String> content,
         }
 
         switch (code) {
-            case "ACCOUNT_ID_REQUIRED":
-            case "AUTHORIZATION_INVALID":
-            case "LICENSE_KEY_REQUIRED":
-            case "USER_ID_REQUIRED":
-                throw new AuthenticationException(error);
-            case "INSUFFICIENT_FUNDS":
-                throw new InsufficientFundsException(error);
-            case "PERMISSION_REQUIRED":
-                throw new PermissionRequiredException(error);
-            default:
-                throw new InvalidRequestException(error, code, status, uri, null);
+            case "ACCOUNT_ID_REQUIRED", "AUTHORIZATION_INVALID", "LICENSE_KEY_REQUIRED",
+                    "USER_ID_REQUIRED" -> throw new AuthenticationException(error);
+            case "INSUFFICIENT_FUNDS" -> throw new InsufficientFundsException(error);
+            case "PERMISSION_REQUIRED" -> throw new PermissionRequiredException(error);
+            default -> throw new InvalidRequestException(error, code, status, uri, null);
         }
     }
 

src/main/java/com/maxmind/minfraud/exception/HttpException.java

@@ -1,9 +1,7 @@
 package com.maxmind.minfraud.exception;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 
 /**
  * This class represents an HTTP transport error. This is not an error returned by the web service
@@ -51,16 +49,4 @@ public URI getUri() {
         return this.uri;
     }
 
-    /**
-     * @return the URL queried.
-     * @deprecated Use getUri() instead
-     */
-    @Deprecated
-    public URL getUrl() {
-        try {
-            return this.uri.toURL();
-        } catch (MalformedURLException e) {
-            return null;
-        }
-    }
 }

src/main/java/com/maxmind/minfraud/exception/InsufficientFundsException.java

@@ -4,7 +4,7 @@
  * This exception is thrown when your account does not have sufficient funds to complete the
  * request.
  */
-public class InsufficientFundsException extends MinFraudException {
+public final class InsufficientFundsException extends MinFraudException {
 
     /**
      * @param message A message explaining the cause of the error.

src/main/java/com/maxmind/minfraud/exception/InvalidRequestException.java

@@ -1,15 +1,13 @@
 package com.maxmind.minfraud.exception;
 
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 
 /**
  * This class represents a non-specific error returned by MaxMind's minFraud web service. This
  * occurs when the web service is up and responding to requests, but the request sent was invalid in
  * some way.
  */
-public class InvalidRequestException extends MinFraudException {
+public final class InvalidRequestException extends MinFraudException {
     private final String code;
     private final int httpStatus;
     private final URI uri;
@@ -63,16 +61,4 @@ public URI getUri() {
         return this.uri;
     }
 
-    /**
-     * @return the URL queried.
-     * @deprecated Use getUri() instead
-     */
-    @Deprecated
-    public URL getUrl() {
-        try {
-            return this.uri.toURL();
-        } catch (MalformedURLException e) {
-            return null;
-        }
-    }
 }

src/main/java/com/maxmind/minfraud/exception/MinFraudException.java

@@ -7,7 +7,9 @@
  * It also serves as the base class for {@code AuthenticationException},
  * {@code InsufficientFundsException}, and {@code InvalidRequestException}.
  */
-public class MinFraudException extends Exception {
+public sealed class MinFraudException extends Exception
+    permits AuthenticationException, InsufficientFundsException, InvalidRequestException,
+        PermissionRequiredException {
 
     /**
      * @param message A message explaining the cause of the error.

src/main/java/com/maxmind/minfraud/request/AbstractLocation.java

@@ -41,7 +41,7 @@ protected AbstractLocation(AbstractLocation.Builder builder) {
      * @param <T> the builder class
      */
     @SuppressWarnings("unchecked")
-    abstract static class Builder<T extends AbstractLocation.Builder> {
+    abstract static class Builder<T extends AbstractLocation.Builder<T>> {
         private static final Pattern COUNTRY_CODE_PATTERN = Pattern.compile("^[A-Z]{2}$");
 
         String firstName;