API-7698: Fix possible issue with connection becoming stalled after interrupt during call.execute (#107)

* API-7698: Added workaround to fix SocketTimeException in okHttp

* API-7698: Fixed error handling

* API-7698: Added overloaded constructor with both baseUrl and okHttpClient

* API-7698: Made enqueue requests optional

* API-7698: Don't interrupt

* API-7698: Added test

Author: sbogolii-sift

CHANGES.MD

@@ -1,3 +1,7 @@
+3.14.2 (2024-05-20)
+=================
+- Fixed bug with okHttp causing SocketTimeoutException
+
 3.14.1 (2024-05-16)
 =================
 - Added support for warnings in Events API

README.md

@@ -13,13 +13,13 @@ Java 1.7 or later.
 <dependency>
     <groupId>com.siftscience</groupId>
     <artifactId>sift-java</artifactId>
-    <version>3.14.1</version>
+    <version>3.14.2</version>
 </dependency>
 ```
 ### Gradle
 ```
 dependencies {
-    compile 'com.siftscience:sift-java:3.14.1'
+    compile 'com.siftscience:sift-java:3.14.2'
 }
 ```
 ### Other

build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'signing'
 apply plugin: 'java-library-distribution'
 
 group = 'com.siftscience'
-version = '3.14.1'
+version = '3.14.2'
 
 repositories {
     mavenCentral()

src/main/java/com/siftscience/ApplyDecisionRequest.java

@@ -3,12 +3,14 @@
 import java.io.IOException;
 
 import com.siftscience.model.ApplyDecisionFieldSet;
-import okhttp3.*;
+import okhttp3.Credentials;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
 
 public class ApplyDecisionRequest extends SiftRequest<ApplyDecisionResponse>{
 
-    ApplyDecisionRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, ApplyDecisionFieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    ApplyDecisionRequest(HttpUrl baseUrl, String accountId, HttpClient httpClient, ApplyDecisionFieldSet fields) {
+        super(baseUrl, accountId, httpClient, fields);
     }
 
     @Override

src/main/java/com/siftscience/Constants.java

@@ -3,6 +3,6 @@
 public class Constants {
 
     public static final String API_VERSION = "v205";
-    public static final String LIB_VERSION = "3.14.1";
+    public static final String LIB_VERSION = "3.14.2";
     public static final String USER_AGENT_HEADER = String.format("SiftScience/%s sift-java/%s", API_VERSION, LIB_VERSION);
 }

src/main/java/com/siftscience/CreateMerchantRequest.java

@@ -1,18 +1,17 @@
 package com.siftscience;
 
+import java.io.IOException;
+
+import okhttp3.Credentials;
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.Credentials;
-
-import java.io.IOException;
 
 
 public class CreateMerchantRequest extends SiftMerchantRequest<CreateMerchantResponse> {
 
-    CreateMerchantRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, FieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    CreateMerchantRequest(HttpUrl baseUrl, String accountId, HttpClient httpClient, FieldSet fields) {
+        super(baseUrl, accountId, httpClient, fields);
     }
 
     @Override

src/main/java/com/siftscience/DecisionStatusRequest.java

@@ -1,16 +1,18 @@
 package com.siftscience;
 
-import com.siftscience.model.DecisionStatusFieldSet;
-import okhttp3.*;
-
 import java.io.IOException;
 
 import static com.siftscience.model.DecisionStatusFieldSet.ENTITY_CONTENT;
 import static com.siftscience.model.DecisionStatusFieldSet.ENTITY_SESSIONS;
+import com.siftscience.model.DecisionStatusFieldSet;
+import okhttp3.Credentials;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class DecisionStatusRequest extends SiftRequest<DecisionStatusResponse> {
-    DecisionStatusRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, DecisionStatusFieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    DecisionStatusRequest(HttpUrl baseUrl, String accountId, HttpClient httpClient, DecisionStatusFieldSet fields) {
+        super(baseUrl, accountId, httpClient, fields);
     }
 
     @Override

src/main/java/com/siftscience/EventRequest.java

@@ -22,8 +22,8 @@ public class EventRequest extends SiftRequest<EventResponse> {
     private boolean returnScorePercentiles = false;
     private boolean returnWarnings = false;
 
-    EventRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, FieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    EventRequest(HttpUrl baseUrl, String accountId, HttpClient client, FieldSet fields) {
+        super(baseUrl, accountId, client, fields);
         abuseTypes = null;
     }
 

src/main/java/com/siftscience/GetDecisionsRequest.java

@@ -1,19 +1,18 @@
 package com.siftscience;
 
-import com.siftscience.model.GetDecisionFieldSet;
-
 import java.io.IOException;
+
+import com.siftscience.model.GetDecisionFieldSet;
 import okhttp3.Credentials;
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
 
 public class GetDecisionsRequest extends SiftRequest<GetDecisionsResponse> {
 
-    GetDecisionsRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, FieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    GetDecisionsRequest(HttpUrl baseUrl, String accountId, HttpClient httpClient, FieldSet fields) {
+        super(baseUrl, accountId, httpClient, fields);
     }
 
     public enum Query {

src/main/java/com/siftscience/GetMerchantRequest.java

@@ -1,15 +1,18 @@
 package com.siftscience;
 
-import com.siftscience.model.GetMerchantFieldSet;
-import okhttp3.*;
-
 import java.io.IOException;
 
+import com.siftscience.model.GetMerchantFieldSet;
+import okhttp3.Credentials;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import okhttp3.Response;
+
 
 public class GetMerchantRequest extends SiftMerchantRequest<GetMerchantResponse> {
 
-    GetMerchantRequest(HttpUrl baseUrl, String accountId, OkHttpClient okClient, FieldSet fields) {
-        super(baseUrl, accountId, okClient, fields);
+    GetMerchantRequest(HttpUrl baseUrl, String accountId, HttpClient httpClient, FieldSet fields) {
+        super(baseUrl, accountId, httpClient, fields);
     }
 
     @Override