From 7b77750286dd8e907d9d77473d21f68f13f8e2b5 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Tue, 30 Jan 2024 12:41:37 +0100
Subject: [PATCH] refactor(helm): remove unneeded apache httpclient dependency

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 jkube-kit/helm/pom.xml                                   | 4 ----
 .../kit/resource/helm/HelmRepositoryConnectionUtils.java | 4 ++--
 .../resource/helm/oci/OCIRegistryInterceptorTest.java    | 9 ++++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/jkube-kit/helm/pom.xml b/jkube-kit/helm/pom.xml
index a597e2e784..72a9b264e9 100644
--- a/jkube-kit/helm/pom.xml
+++ b/jkube-kit/helm/pom.xml
@@ -42,10 +42,6 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.eclipse.jkube</groupId>
diff --git a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java
index 401c70d9f5..a3b743b46b 100644
--- a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java
+++ b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java
@@ -20,8 +20,8 @@
 import java.net.PasswordAuthentication;
 import java.net.URL;
 
+import io.fabric8.kubernetes.client.http.StandardHttpHeaders;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpHeaders;
 
 public class HelmRepositoryConnectionUtils {
 
@@ -54,7 +54,7 @@ private static HttpURLConnection createConnection(HelmRepository repository, Str
     final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
     connection.setDoOutput(true);
     connection.setRequestMethod("POST");
-    connection.setRequestProperty(HttpHeaders.CONTENT_TYPE, "application/gzip");
+    connection.setRequestProperty(StandardHttpHeaders.CONTENT_TYPE, "application/gzip");
     verifyAndSetAuthentication(repository);
     return connection;
   }
diff --git a/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java
index 4938bfcc30..629809bbd6 100644
--- a/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java
+++ b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java
@@ -28,7 +28,6 @@
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
 import io.fabric8.mockwebserver.DefaultMockServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.apache.http.HttpHeaders;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -113,7 +112,7 @@ void afterFailure_whenAuthCallFails_thenReturnFalse() {
         .once();
     String service = "localhost";
     String wwwHeader = createWwwHeader(authUrl, service);
-    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap(HttpHeaders.WWW_AUTHENTICATE, Collections.singletonList(wwwHeader));
+    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap("WWW-Authenticate", Collections.singletonList(wwwHeader));
     HttpRequest.Builder builder = mock(HttpRequest.Builder.class, Mockito.RETURNS_SELF);
     HttpResponse<byte[]> response = new TestHttpResponse<byte[]>(unAuthorizedResponseHeaders).withCode(HTTP_UNAUTHORIZED);
 
@@ -133,7 +132,7 @@ void afterFailure_whenUnauthenticated_thenShouldAuthenticateWithGetAndFetchAcces
         .once();
     String service = "localhost";
     String wwwHeader = createWwwHeader(authUrl, service);
-    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap(HttpHeaders.WWW_AUTHENTICATE, Collections.singletonList(wwwHeader));
+    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap("WWW-Authenticate", Collections.singletonList(wwwHeader));
     HttpRequest.Builder builder = mock(HttpRequest.Builder.class, Mockito.RETURNS_SELF);
     HttpResponse<byte[]> response = new TestHttpResponse<byte[]>(unAuthorizedResponseHeaders).withCode(HTTP_UNAUTHORIZED);
 
@@ -157,7 +156,7 @@ void afterFailure_whenGetNotAllowedAndPostAlsoFails_thenReturnFalse() {
         .once();
     String service = "localhost";
     String wwwHeader = createWwwHeader(authUrl, service);
-    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap(HttpHeaders.WWW_AUTHENTICATE, Collections.singletonList(wwwHeader));
+    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap("WWW-Authenticate", Collections.singletonList(wwwHeader));
     HttpRequest.Builder builder = mock(HttpRequest.Builder.class, Mockito.RETURNS_SELF);
     HttpResponse<byte[]> response = new TestHttpResponse<byte[]>(unAuthorizedResponseHeaders).withCode(HTTP_UNAUTHORIZED);
 
@@ -181,7 +180,7 @@ void afterFailure_whenGetNotAllowed_thenShouldAuthenticateWithPostAndFetchAccess
         .once();
     String service = "localhost";
     String wwwHeader = createWwwHeader(authUrl, service);
-    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap(HttpHeaders.WWW_AUTHENTICATE, Collections.singletonList(wwwHeader));
+    Map<String, List<String>> unAuthorizedResponseHeaders = Collections.singletonMap("WWW-Authenticate", Collections.singletonList(wwwHeader));
     HttpRequest.Builder builder = mock(HttpRequest.Builder.class, Mockito.RETURNS_SELF);
     HttpResponse<byte[]> response = new TestHttpResponse<byte[]>(unAuthorizedResponseHeaders).withCode(HTTP_UNAUTHORIZED);