Merge pull request #205 from maxmind/greg/httpclient

Switch to HttpClient and prepare for major version bump

Author: horgh

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        version: [ 8, 9, 10, 11, 12, 13, 14, 15 ]
+        version: [ 11, 12, 13, 14, 15 ]
     steps:
       - uses: actions/checkout@v2
         with:

CHANGELOG.md

@@ -1,9 +1,33 @@
 CHANGELOG
 =========
 
-1.19.0
+2.0.0
 -------------------
 
+* Java 11 or greater is now required.
+* Apache HttpClient has been replaced with `java.net.http.HttpClient`.
+* The `close()` method on `WebServiceClient` is now deprecated. It
+  no longer does anything.
+* On `WebServiceClient.Builder`:
+  * `connectTimeout(int)` has been deprecated in favor of
+    `connectTimeout(Duration)`.
+  * `readTimeout(int)` has been deprecated in favor of
+    `requestTimeout(Duration)`.
+  * `proxy(Proxy)` has been deprecated in favor of `proxy(ProxySelector)`.
+* On `HttpException` and `InvalidRequestException`, `getUrl()` has been
+  deprecated in favor of `getUri()`. Constructors that took a `URL` have
+  been replaced with the equivalent taking a `URI`.
+* Deprecated constructors on model classes were removed.
+* Removed deprecated response methods:
+  * `Email.getAddressMd5()`
+  * `Subscores.getEmailTenure()`
+  * `Subscores.getIpTenure()`
+* Removed `GeoIp2Country` and its associated `isHighRisk()` method.
+  `IpAddress.getCountry()` now returns a `com.maxmind.geoip2.record.Country`.
+* Removed deprecated `Payment.Processor.VERAPAY` enum value. Use `VEREPAY`
+  instead.
+* `Email.getDomain()` will now return an empty object rather than null if
+  there is no domain data. This is match other response model class getters.
 * Upgraded the `geoip2` dependency to 2.16.1. This adds mobile country code
   (MCC) and mobile network code (MNC) to minFraud Insights and Factors
   responses. These are available at

README.md

@@ -271,9 +271,9 @@ If you are having an issue with the minFraud service that is not specific
 to the client API, please see
 [our support page](https://www.maxmind.com/en/support).
 
-## Requirements  ##
+## Requirements ##
 
-This code requires Java 8+.
+This code requires Java 11+.
 
 ## Contributing ##
 

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.maxmind.minfraud</groupId>
@@ -64,29 +65,6 @@
             <artifactId>geoip2</artifactId>
             <version>2.16.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-        </dependency>
-        <dependency>
-            <!-- httpclient pulls this in. We pull in a newer version
-            because of a security issue in 1.11 -->
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <!--
-            commons-validator 1.6 depends on an older version of
-            commons-beanutils with a CVE. So add a direct dependency on the
-            commons-beanutils version that is fixed, while we wait for
-            commons-validator to be updated.
-        -->
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
-        </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
@@ -110,12 +88,6 @@
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.32</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jr</groupId>
             <artifactId>jackson-jr-objects</artifactId>
@@ -160,7 +132,7 @@
                 <version>3.3.1</version>
                 <configuration>
                     <show>public</show>
-                    <source>8</source>
+                    <source>11</source>
                 </configuration>
             </plugin>
             <plugin>
@@ -186,8 +158,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
+                    <source>1.11</source>
+                    <target>1.11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -233,7 +206,7 @@
                 <configuration>
                     <format>xml</format>
                     <maxmem>256m</maxmem>
-                    <check />
+                    <check/>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -1,31 +1,14 @@
 package com.maxmind.minfraud;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
 import java.io.IOException;
 
 public abstract class AbstractModel {
-
     /**
      * @return JSON representation of this object.
      * @throws IOException if there is an error serializing the object to JSON.
      */
     public final String toJson() throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JavaTimeModule());
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-        mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
-        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-
-        return mapper.writeValueAsString(this);
+        return Mapper.get().writeValueAsString(this);
     }
 
     @Override

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

@@ -0,0 +1,27 @@
+package com.maxmind.minfraud;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+class Mapper {
+    private final static ObjectMapper mapper = JsonMapper.builder()
+            .addModule(new JavaTimeModule())
+            .defaultDateFormat(new StdDateFormat().withColonInTimeZone(true))
+            .enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
+            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .serializationInclusion(JsonInclude.Include.NON_NULL)
+            .serializationInclusion(JsonInclude.Include.NON_EMPTY)
+            .build();
+
+    public static ObjectMapper get() {
+        return mapper;
+    }
+}