From 8a376a8e0f1d8ee47a80166eb404b9e005ea772b Mon Sep 17 00:00:00 2001
From: Justin Tay <49700559+justin-tay@users.noreply.github.com>
Date: Wed, 26 Jul 2023 10:52:20 +0800
Subject: [PATCH] Upgrade to httpclient5

---
 elide-async/pom.xml                               |  4 ++--
 .../operation/JsonApiAsyncQueryOperation.java     |  5 ++---
 .../operation/JsonApiTableExportOperation.java    |  2 +-
 .../async/service/AsyncExecutorServiceTest.java   |  2 +-
 pom.xml                                           | 15 ++++++++-------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/elide-async/pom.xml b/elide-async/pom.xml
index ea0960cf1e..e4cb4410b2 100644
--- a/elide-async/pom.xml
+++ b/elide-async/pom.xml
@@ -58,8 +58,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiAsyncQueryOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiAsyncQueryOperation.java
index 0a9241cd81..3292662572 100644
--- a/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiAsyncQueryOperation.java
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiAsyncQueryOperation.java
@@ -13,8 +13,8 @@
 import com.yahoo.elide.core.request.route.Route;
 import com.yahoo.elide.core.security.User;
 import com.yahoo.elide.jsonapi.JsonApi;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URIBuilder;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,7 +46,6 @@ public ElideResponse<String> execute(AsyncApi queryObj, RequestScope scope)
         Map<String, List<String>> queryParams = getQueryParams(uri);
         log.debug("Extracted QueryParams from AsyncQuery Object: {}", queryParams);
 
-        //TODO - we need to add the baseUrlEndpoint to the queryObject.
         Route route = Route.builder().baseUrl(scope.getRoute().getBaseUrl()).path(getPath(uri)).parameters(queryParams)
                 .headers(scope.getRoute().getHeaders()).apiVersion(apiVersion).build();
         ElideResponse<String> response = jsonApi.get(route, user, requestUUID);
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiTableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiTableExportOperation.java
index 9e03788d0e..807dcf333c 100644
--- a/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiTableExportOperation.java
+++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/JsonApiTableExportOperation.java
@@ -21,7 +21,7 @@
 import com.yahoo.elide.jsonapi.EntityProjectionMaker;
 import com.yahoo.elide.jsonapi.JsonApiRequestScope;
 
-import org.apache.http.client.utils.URIBuilder;
+import org.apache.hc.core5.net.URIBuilder;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java
index 8ef81f9516..2a9ad8847f 100644
--- a/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java
+++ b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncExecutorServiceTest.java
@@ -35,7 +35,7 @@
 import com.yahoo.elide.core.utils.DefaultClassScanner;
 import com.yahoo.elide.jsonapi.JsonApiSettings;
 
-import org.apache.http.NoHttpResponseException;
+import org.apache.hc.core5.http.NoHttpResponseException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index 0c0d7ed1a7..05413e4dbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
         <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
         <hibernate-search.version>6.2.1.Final</hibernate-search.version>
         <hjson.version>3.0.1</hjson.version>
-        <httpclient.version>4.5.14</httpclient.version>
+        <httpclient5.version>5.2.1</httpclient5.version>
         <gson.version>2.10.1</gson.version>
         <h2.version>2.2.224</h2.version>
         <hikaricp.version>5.0.1</hikaricp.version>
@@ -149,6 +149,7 @@
         <tomcat.version>10.1.13</tomcat.version>
         <mockito.version>5.6.0</mockito.version>
 
+
         <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <checkstyle.version>10.12.4</checkstyle.version>
@@ -426,7 +427,7 @@
                 <groupId>org.owasp.encoder</groupId>
                 <artifactId>encoder</artifactId>
                 <version>${encoder.version}</version>
-            </dependency>            
+            </dependency>
             <dependency>
                 <groupId>org.fusesource.jansi</groupId>
                 <artifactId>jansi</artifactId>
@@ -462,9 +463,9 @@
                 <version>${handlebars.version}</version>
             </dependency>
             <dependency>
-               <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
+               <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpclient5.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.opendevl</groupId>
@@ -492,12 +493,12 @@
                 <groupId>org.skyscreamer</groupId>
                 <artifactId>jsonassert</artifactId>
                 <version>${jsonassert.version}</version>
-            </dependency>            
+            </dependency>
             <dependency>
                 <groupId>com.github.stefanbirkner</groupId>
                 <artifactId>system-lambda</artifactId>
                 <version>${system-lambda.version}</version>
-            </dependency>            
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>