Merge pull request #71 from bitsoex/dependency-updates

Dependency updates

Author: chochos

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.github.bitsoex'
-version = '4.1.0'
+version = '4.2.0'
 
 description = "bitso-java"
 
@@ -23,11 +23,11 @@ repositories {
 }
 
 dependencies {
-    api 'org.apache.httpcomponents:httpclient:4.5.13'
-    api 'org.json:json:20250517'
-    api 'io.netty:netty-all:4.2.2.Final'
+    api 'org.apache.httpcomponents.client5:httpclient5:5.6'
+    api 'org.json:json:20251224'
+    api 'io.netty:netty-all:4.2.10.Final'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.14.2'
     testImplementation 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -7,10 +7,10 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.json.JSONObject;
 
 public class BitsoJavaExample {

gradlew

@@ -6,26 +6,29 @@
 import java.net.ProtocolException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-
 import com.bitso.exceptions.BitsoAPIException;
 
 import com.bitso.helpers.Helpers;
+import org.apache.hc.client5.http.ClientProtocolException;
+import org.apache.hc.client5.http.classic.methods.HttpDelete;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.io.entity.StringEntity;
 
 public class BlockingHttpClient {
+    public static final String CONTENT_TYPE = "Content-Type";
     private boolean log = false;
     private long throttleMs = -1;
     private long lastCallTime = 0;
@@ -56,6 +59,7 @@ private void throttle() {
             lastCallTime = System.currentTimeMillis();
         } catch (InterruptedException e) {
             log("Error executing throttle");
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -85,29 +89,37 @@ public String sendPost(String url, String body, HashMap<String, String> headers)
 
             return Helpers.convertInputStreamToString(connection.getInputStream());
         } catch (MalformedURLException e) {
-            e.printStackTrace();
             throw new BitsoAPIException(322, "Not a Valid URL", e);
         } catch (ProtocolException e) {
-            e.printStackTrace();
             throw new BitsoAPIException(901, "Unsupported HTTP method", e);
         } catch (IOException e) {
-            e.printStackTrace();
+            e.printStackTrace(System.err);
             return Helpers.convertInputStreamToString(connection.getErrorStream());
         }
     }
 
     public String sendPost(String url, String body, HashMap<String, String> headers, Charset charset)
-            throws ClientProtocolException, IOException {
+            throws IOException {
         return sendPost(url, new StringEntity(body, charset), headers);
     }
 
     public String sendPost(String url, byte[] body, HashMap<String, String> headers)
-            throws ClientProtocolException, IOException {
-        return sendPost(url, new ByteArrayEntity(body), headers);
+            throws IOException {
+        ContentType contentType = ContentType.APPLICATION_JSON;
+        if (headers != null && headers.containsKey(CONTENT_TYPE)) {
+            try {
+                contentType = ContentType.parse(headers.get(CONTENT_TYPE));
+                headers = new HashMap<>(headers);
+                headers.remove(CONTENT_TYPE);
+            } catch (UnsupportedCharsetException ex) {
+                //Revert to default
+            }
+        }
+        return sendPost(url, new ByteArrayEntity(body, 0, body.length, contentType), headers);
     }
 
     private String sendPost(String url, AbstractHttpEntity body, HashMap<String, String> headers)
-            throws ClientProtocolException, IOException {
+            throws IOException {
         throttle();
 
         HttpPost postRequest = new HttpPost(url);
@@ -119,13 +131,13 @@ private String sendPost(String url, AbstractHttpEntity body, HashMap<String, Str
 
         postRequest.setEntity(body);
 
-        CloseableHttpResponse closeableHttpResponse = HttpClients.createDefault().execute(postRequest);
-        String response = Helpers.convertInputStreamToString(closeableHttpResponse.getEntity().getContent());
-
-        return response;
+        try (CloseableHttpClient client = HttpClients.createDefault();
+            CloseableHttpResponse response = client.execute(postRequest)) {
+            return Helpers.convertInputStreamToString(response.getEntity().getContent());
+        }
     }
 
-    public String sendDelete(String url, HashMap<String, String> headers) throws BitsoAPIException {
+    public String sendDelete(String url, Map<String, String> headers) throws BitsoAPIException {
         throttle();
         HttpDelete deleteURL = new HttpDelete(url);
 
@@ -135,16 +147,12 @@ public String sendDelete(String url, HashMap<String, String> headers) throws Bit
             }
         }
 
-        CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
-        try {
-            response = closeableHttpClient.execute(deleteURL);
+        try (CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
+            CloseableHttpResponse response = closeableHttpClient.execute(deleteURL)) {
             return Helpers.convertInputStreamToString(response.getEntity().getContent());
         } catch (ClientProtocolException e) {
-            e.printStackTrace();
             throw new BitsoAPIException(901, "Usupported HTTP method", e);
         } catch (IOException e) {
-            e.printStackTrace();
             throw new BitsoAPIException(101, "Connection Aborted", e);
         }
     }