Updated dependencies, fixed issue in readAll when response stream is null, incremented version

Author: JanHolger

README.md

@@ -22,6 +22,6 @@ You can find the current docs on our [website](https://docs.javawebstack.org/fra
 <dependency>
     <groupId>org.javawebstack</groupId>
     <artifactId>http-client</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 </dependency>
 ```

pom.xml

@@ -50,18 +50,18 @@
         <dependency>
             <groupId>org.javawebstack</groupId>
             <artifactId>abstract-data</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.1.3</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

src/main/java/org/javawebstack/httpclient/HTTPRequest.java

@@ -259,6 +259,8 @@ private String buildUrl() {
     }
 
     private static byte[] readAll(InputStream is) throws IOException {
+        if(is == null)
+            return new byte[0];
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         byte[] data = new byte[1024];
         int r = 0;

src/main/java/org/javawebstack/httpclient/implementation/ApacheHTTPRequestImplementation.java

@@ -1,24 +1,27 @@
 package org.javawebstack.httpclient.implementation;
 
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.TrustAllStrategy;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.ssl.SSLContextBuilder;
-
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.apache.hc.client5.http.ssl.TrustAllStrategy;
+import org.apache.hc.core5.http.*;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
+import org.apache.hc.core5.ssl.SSLContextBuilder;
+
+import javax.net.ssl.SSLContext;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class ApacheHTTPRequestImplementation implements IHTTPRequestImplementation {
 
@@ -76,6 +79,8 @@ public Map<String, String[]> getResponseHeaders() {
     }
 
     public InputStream getResponseStream() {
+        if(responseEntity == null)
+            return new ByteArrayInputStream(new byte[0]);
         try {
             return responseEntity.getContent();
         } catch (IOException ignored) {
@@ -86,22 +91,28 @@ public InputStream getResponseStream() {
     public int execute() {
         try {
             RequestConfig config = RequestConfig.custom()
-                    .setConnectTimeout(timeout)
-                    .setConnectionRequestTimeout(timeout)
+                    .setConnectTimeout(timeout, TimeUnit.MILLISECONDS)
+                    .setConnectionRequestTimeout(timeout, TimeUnit.MILLISECONDS)
                     .setRedirectsEnabled(followRedirects)
                     .build();
             HttpClientBuilder clientBuilder = HttpClientBuilder.create()
                     .setDefaultRequestConfig(config);
 
             if(!sslVerification) {
-                clientBuilder
-                        .setSSLContext(new SSLContextBuilder().loadTrustMaterial(null, TrustAllStrategy.INSTANCE).build())
-                        .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
+                SSLContext context = new SSLContextBuilder().loadTrustMaterial(null, TrustAllStrategy.INSTANCE).build();
+                HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create()
+                        .setSSLSocketFactory(SSLConnectionSocketFactoryBuilder.create()
+                                .setSslContext(context)
+                                .setHostnameVerifier(NoopHostnameVerifier.INSTANCE)
+                                .build()
+                        )
+                        .build();
+                clientBuilder.setConnectionManager(cm);
             }
 
             HttpClient client = clientBuilder.build();
 
-            RequestBuilder builder = RequestBuilder.create(method);
+            ClassicRequestBuilder builder = ClassicRequestBuilder.create(method);
             builder.setUri(url);
             requestHeaders.forEach((k, values) -> {
                 for(String v : values)
@@ -113,12 +124,13 @@ public int execute() {
                 builder.setEntity(new ByteArrayEntity(requestBody, ContentType.create(contentType)));
             }
 
-            HttpResponse response = client.execute(builder.build());
+            ClassicHttpResponse response = client.execute(builder.build(), res -> res);
+            responseEntity = response.getEntity();
 
-            status = response.getStatusLine().getStatusCode();
-            statusMessage = response.getStatusLine().getReasonPhrase();
+            status = response.getCode();
+            statusMessage = response.getReasonPhrase();
             Map<String, List<String>> resHeaders = new HashMap<>();
-            for(Header h : response.getAllHeaders())
+            for(Header h : response.getHeaders())
                 resHeaders.computeIfAbsent(h.getName().toLowerCase(Locale.ROOT), n -> new ArrayList<>()).add(h.getValue());
             resHeaders.forEach((k, v) -> responseHeaders.put(k, v.toArray(new String[0])));