Adopt apache http client 5

Author: IvanBorislavovDimitrov

multiapps-controller-core-test/pom.xml

@@ -14,8 +14,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.cloudfoundry.multiapps</groupId>

multiapps-controller-core-test/src/main/java/module-info.java

@@ -2,16 +2,16 @@
 
     exports org.cloudfoundry.multiapps.controller.core.test;
 
-    requires transitive org.apache.httpcomponents.httpcore;
     requires transitive org.cloudfoundry.multiapps.mta;
 
-    requires org.apache.httpcomponents.httpclient;
+    requires org.apache.httpcomponents.core5.httpcore5;
     requires org.cloudfoundry.multiapps.common;
     requires org.cloudfoundry.multiapps.common.test;
     requires org.junit.jupiter.api;
     requires org.mockito;
 
     requires static java.compiler;
     requires static org.immutables.value;
+    requires org.apache.httpcomponents.client5.httpclient5;
 
 }

multiapps-controller-core-test/src/main/java/org/cloudfoundry/multiapps/controller/core/test/HttpClientMock.java

@@ -2,12 +2,12 @@
 
 import java.io.IOException;
 import java.util.List;
-
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.cloudfoundry.multiapps.common.Nullable;
 import org.immutables.value.Value;
 import org.mockito.ArgumentMatchers;
@@ -23,9 +23,6 @@ public abstract class HttpClientMock {
     @Nullable
     public abstract Throwable getException();
 
-    @Nullable
-    public abstract String getResponseHandlerReturnValue();
-
     @Value.Derived
     public CloseableHttpClient getMock() {
         try {
@@ -49,12 +46,10 @@ public CloseableHttpClient getMock() {
             Mockito.when(httpClient.execute(ArgumentMatchers.<HttpHost> any(), ArgumentMatchers.any(),
                                             ArgumentMatchers.<HttpContext> any()))
                    .thenAnswer(answer);
+            Mockito.when(
+                       httpClient.execute(ArgumentMatchers.<ClassicHttpRequest> any(), ArgumentMatchers.<HttpClientResponseHandler<Object>> any()))
+                   .thenAnswer(answer);
 
-            if (getResponseHandlerReturnValue() != null) {
-                Mockito.when(httpClient.execute(ArgumentMatchers.any(), ArgumentMatchers.any(),
-                                                ArgumentMatchers.<ResponseHandler<Object>> any()))
-                       .thenReturn(getResponseHandlerReturnValue());
-            }
             return httpClient;
         } catch (IOException e) {
             throw new IllegalStateException(e);

multiapps-controller-core-test/src/main/java/org/cloudfoundry/multiapps/controller/core/test/HttpMocks.java

@@ -1,9 +1,8 @@
 package org.cloudfoundry.multiapps.controller.core.test;
 
 import java.util.function.UnaryOperator;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 
 public class HttpMocks {
 

multiapps-controller-core-test/src/main/java/org/cloudfoundry/multiapps/controller/core/test/HttpResponseMock.java

@@ -3,16 +3,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicStatusLine;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHeader;
 import org.immutables.value.Value;
 import org.mockito.Mockito;
 
@@ -28,18 +24,14 @@ public abstract class HttpResponseMock {
     @Value.Derived
     public CloseableHttpResponse getMock() {
         CloseableHttpResponse response = Mockito.mock(CloseableHttpResponse.class);
-        Mockito.when(response.getStatusLine())
-               .thenReturn(createStatusLine(getStatusCode()));
+        Mockito.when(response.getCode())
+               .thenReturn(getStatusCode());
         Mockito.when(response.getEntity())
                .thenReturn(createHttpEntity(getBody()));
         mockHeaders(response);
         return response;
     }
 
-    private static StatusLine createStatusLine(int statusCode) {
-        return new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), statusCode, null);
-    }
-
     private static HttpEntity createHttpEntity(String body) {
         return new StringEntity(body, StandardCharsets.UTF_8);
     }

multiapps-controller-core/pom.xml

@@ -111,5 +111,9 @@
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
     </dependencies>
 </project>

multiapps-controller-core/src/main/java/module-info.java

@@ -59,8 +59,8 @@
     requires org.apache.commons.collections4;
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
-    requires org.apache.httpcomponents.httpclient;
-    requires org.apache.httpcomponents.httpcore;
+    requires org.apache.httpcomponents.client5.httpclient5;
+    requires org.apache.httpcomponents.core5.httpcore5;
     requires org.cloudfoundry.multiapps.common;
     requires org.cloudfoundry.multiapps.controller.api;
     requires org.slf4j;

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/CloudControllerHeaderConfiguration.java

@@ -1,10 +1,9 @@
 package org.cloudfoundry.multiapps.controller.core.cf;
 
 import java.util.Map;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHeaders;
 import org.cloudfoundry.multiapps.controller.core.Constants;
 
 public class CloudControllerHeaderConfiguration {