JIRA:GRIF-316 upgrade gooddata-http-client to JDK17

Author: alexole01

NOTICE.txt

@@ -8,45 +8,43 @@ This project includes a number of subcomponents with separate copyright notices
 ================================================================================
 DEPENDENCIES
 
-- Apache Commons Codec (1.11) [Apache-2.0, BSD-3-Clause]
 - Apache Commons Lang (3.12.0) [Apache-2.0]
-- Apache Log4j (1.2.17) [Apache-2.0]
-- Byte Buddy (without dependencies) (1.11.13) [BSD-3-Clause, Apache-2.0]
-- Byte Buddy agent (1.11.13) [Apache-2.0]
-- Commons Logging (1.2) [Apache-2.0]
+- Apache Commons Text (1.10.0) [Apache-2.0]
+- Apache HttpClient 5 (5.5) [Apache-2.0]
+- Apache HttpCore 5 (5.3.4) [Apache-2.0]
+- Apache HttpCore 5 H2 (5.3.4) [Apache-2.0]
+- Byte Buddy (without dependencies) (1.14.4) [Apache-2.0]
+- Byte Buddy agent (1.14.4) [Apache-2.0]
 - commons-collections (3.2.2) [Apache-2.0]
 - commons-io (2.11.0) [Apache-2.0]
+- commons-lang (2.6) [Apache-2.0]
 - Hamcrest (2.2) [BSD-3-Clause]
-- Hamcrest Core (1.3) [BSD-3-Clause]
-- Hamcrest library (1.3) BSD-3-Clause]
-- HttpClient (4.5.13) [Apache-2.0]
-- HttpCore (4.4.14) [Apache-2.0]
-- Jackson-annotations (2.13.0) [Apache-2.0]
-- Jackson-core (2.13.0) [Apache-2.0]
-- jackson-databind (2.13.0) [Apache-2.0]
-- jadler-all (1.3.0) [MIT]
-- jadler-core (1.3.0) [MIT]
-- jadler-jetty (1.3.0) [MIT]
-- jadler-junit (1.3.0) [MIT]
+- Jackson-annotations (2.14.2) [Apache-2.0]
+- Jackson-core (2.14.2) [Apache-2.0]
+- jackson-databind (2.14.2) [Apache-2.0]
+- jadler-core (1.3.1) [MIT]
+- jadler-jetty (1.3.1) [MIT]
 - Jetty :: Continuation (8.1.11.v20130520) [Multi-license: EPL-1.0 OR Apache-2.0]
 - Jetty :: Http Utility (8.1.11.v20130520) [Multi-license: EPL-1.0 OR Apache-2.0]
 - Jetty :: IO Utility (8.1.11.v20130520) [Multi-license: EPL-1.0 OR Apache-2.0]
 - Jetty :: Server Core (8.1.11.v20130520) [Multi-license: EPL-1.0 OR Apache-2.0]
 - Jetty :: Utilities (8.1.11.v20130520) [Multi-license: EPL-1.0 OR Apache-2.0, MIT]
 - Jetty Orbit :: Servlet API (3.0.0.v201112011016) [Multi-license: CDDL-1.0 OR GPL-2.0-with-classpath-exception, EPL-1.0, Apache-2.0]
-- JUnit (4.13.2) [CPL-1.0]
-- Lang (2.6) [Apache-2.0]
-- Mockito (3.12.4) [MIT, Apache-2.0]
-- Objenesis (3.2) [MIT]
-- SLF4J API Module (1.7.32) [MIT]
-- SLF4J LOG4J-12 Binding relocated (1.7.32) [MIT]
+- JUnit Jupiter API (5.10.2) [EPL-2.0]
+- JUnit Jupiter Engine (5.10.2) [EPL-2.0]
+- Mockito Core (5.3.1) [MIT]
+- Objenesis (3.3) [Apache-2.0]
+- SLF4J API Module (2.0.7) [MIT]
+- SLF4J Simple Binding (2.0.7) [MIT]
 
 APPENDIX: LICENSES
 Apache-2.0
+BSD-3-Clause
 CDDL-1.0
-CPL-1.0
 EPL-1.0
+EPL-2.0
 GPL-2.0-with-classpath-exception
+MIT
 [End of Table of Contents]
 
 ================================================================================

pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.gooddata</groupId>
         <artifactId>gooddata-parent</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.3</version>
     </parent>
 
     <developers>

src/main/java/com/gooddata/http/client/GoodDataHttpClient.java

@@ -13,9 +13,11 @@
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -27,7 +29,6 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -141,7 +142,7 @@ private ClassicHttpResponse handleResponse(
                     }
                 }
                 final ClassicHttpRequest retryRequest = cloneRequestWithNewTT(originalRequest, tt);
-                return this.httpClient.execute(httpHost, retryRequest, context, response -> response);
+                return this.httpClient.execute(httpHost, retryRequest, context, response -> copyResponseEntity(response));
             } else {
                 tokenRefreshing = true;
             }
@@ -175,7 +176,7 @@ private ClassicHttpResponse handleResponse(
         }
 
         final ClassicHttpRequest retryRequest = cloneRequestWithNewTT(originalRequest, tt);
-        ClassicHttpResponse retryResponse = this.httpClient.execute(httpHost, retryRequest, context, response -> response);
+        ClassicHttpResponse retryResponse = this.httpClient.execute(httpHost, retryRequest, context, response -> copyResponseEntity(response));
 
 
         if (retryResponse.getCode() == HttpStatus.SC_UNAUTHORIZED &&
@@ -309,12 +310,7 @@ public ClassicHttpResponse execute(HttpHost target, ClassicHttpRequest request,
                 request.addHeader(TT_HEADER, tt);
             }
 
-            ClassicHttpResponse resp = this.httpClient.execute(
-                    target,
-                    request,
-                    context,
-                    response -> response
-            );
+            ClassicHttpResponse resp = this.httpClient.execute(target, request, context, response -> copyResponseEntity(response));
 
             if (resp.getCode() == HttpStatus.SC_UNAUTHORIZED) {
                 // 👇 Proper handling of InterruptedException
@@ -343,7 +339,7 @@ public ClassicHttpResponse execute(HttpHost target, ClassicHttpRequest request)
 
 
     public <T> T execute(HttpHost target, ClassicHttpRequest request, HttpContext context,
-                        HttpClientResponseHandler<? extends T> responseHandler) throws IOException {
+                        HttpClientResponseHandler<? extends T> responseHandler) throws IOException, org.apache.hc.core5.http.HttpException {
         return httpClient.execute(target, request, context, responseHandler);
     }
     /**
@@ -354,4 +350,27 @@ private boolean isLogoutRequest(HttpHost target, ClassicHttpRequest request) {
                 && "DELETE".equals(request.getMethod())
                 && URI.create(request.getRequestUri()).getPath().startsWith(LOGIN_URL);
     }
+
+    /**
+     * Helper method to copy response entity to avoid stream closure issues.
+     * Returns a new response with the same properties but a copied entity.
+     */
+    private ClassicHttpResponse copyResponseEntity(ClassicHttpResponse response) throws IOException {
+        if (response.getEntity() == null) {
+            return response;
+        }
+        
+        // Copy the entity content
+        byte[] content = EntityUtils.toByteArray(response.getEntity());
+        ContentType contentType = ContentType.parseLenient(response.getEntity().getContentType());
+        
+        // Create a new response with copied entity
+        BasicClassicHttpResponse newResponse = new BasicClassicHttpResponse(response.getCode(), response.getReasonPhrase());
+        for (Header header : response.getHeaders()) {
+            newResponse.addHeader(header);
+        }
+        newResponse.setEntity(new ByteArrayEntity(content, contentType));
+        
+        return newResponse;
+    }
 }

src/main/java/com/gooddata/http/client/GoodDataHttpStatusException.java

@@ -0,0 +1,42 @@
+/*
+ * (C) 2022 GoodData Corporation.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE.txt file in the root directory of this source tree.
+ */
+package com.gooddata.http.client;
+
+/**
+ * Exception thrown when HTTP operations fail with specific status codes.
+ * This exception wraps HTTP status information to provide detailed error context.
+ */
+public class GoodDataHttpStatusException extends RuntimeException {
+
+    private final int code;
+    private final String reason;
+
+    public GoodDataHttpStatusException(int code, String reason) {
+        super("HTTP " + code + ": " + reason);
+        this.code = code;
+        this.reason = reason;
+    }
+
+    public GoodDataHttpStatusException(String message, int code, String reason) {
+        super(message);
+        this.code = code;
+        this.reason = reason;
+    }
+
+    public GoodDataHttpStatusException(String message, Throwable cause, int code, String reason) {
+        super(message, cause);
+        this.code = code;
+        this.reason = reason;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+}

src/test/java/com/gooddata/http/client/GoodDataHttpClientAT.java

@@ -29,15 +29,15 @@ public class GoodDataHttpClientAT {
     private final HttpHost httpHost = new HttpHost("https", System.getProperty("GDC_BACKEND", "secure.gooddata.com"), 443);
 
     @Test
-    public void gdcLogin() throws IOException {
+    public void gdcLogin() throws IOException, org.apache.hc.core5.http.HttpException {
         // Modern style: use TestUtils.createGoodDataClient, returns a GoodDataHttpClient wrapper
         final GoodDataHttpClient client = createGoodDataClient(login, password, httpHost);
         // performGet expects GoodDataHttpClient, uses execute() with a lambda (see TestUtils)
         performGet(client, httpHost, GDC_PROJECTS_PATH, HttpStatus.SC_OK);
     }
 
     @Test
-    public void gdcSstSimple() throws IOException {
+    public void gdcSstSimple() throws IOException, org.apache.hc.core5.http.HttpException {
         final HttpClient httpClient = HttpClients.createDefault();
         final LoginSSTRetrievalStrategy loginSSTRetrievalStrategy = new LoginSSTRetrievalStrategy(login, password);
         final String sst = loginSSTRetrievalStrategy.obtainSst(httpClient, httpHost);
@@ -52,7 +52,7 @@ public void gdcSstSimple() throws IOException {
     private static final Pattern profilePattern = Pattern.compile("\"/gdc/account/profile/([^\"]+)\"");
 
     @Test
-    public void gdcLogout() throws IOException {
+    public void gdcLogout() throws IOException, org.apache.hc.core5.http.HttpException {
         final GoodDataHttpClient client = createGoodDataClient(login, password, httpHost);
         final String response = getForEntity(client, httpHost, "/gdc/account/profile/current", HttpStatus.SC_OK);
         final Matcher matcher = profilePattern.matcher(response);

src/test/java/com/gooddata/http/client/GoodDataHttpClientIntegrationTest.java

@@ -84,7 +84,7 @@ public void tearDown() {
     }
 
     @Test
-    public void vi () throws IOException {
+    public void vi () throws IOException, org.apache.hc.core5.http.HttpException {
         mock401OnProjects();
         mock401OnToken();
 
@@ -96,7 +96,11 @@ public void vi () throws IOException {
 
         final GoodDataHttpClient client = createGoodDataClient(jadlerLogin, jadlerPassword, jadlerHost);
 
-        performGet(client, jadlerHost, GDC_PROJECTS_PATH, HttpStatus.SC_UNAUTHORIZED);
+        // When login fails with 401, obtainSst() throws GoodDataAuthException
+        org.junit.jupiter.api.Assertions.assertThrows(
+            GoodDataAuthException.class,
+            () -> performGet(client, jadlerHost, GDC_PROJECTS_PATH, HttpStatus.SC_UNAUTHORIZED)
+        );
     }
 
 
@@ -150,7 +154,7 @@ private PerformGetWithCountDown(GoodDataHttpClient client, String path, CountDow
         public void run() {
             try {
                 performGet(client, jadlerHost, path, HttpStatus.SC_OK);
-            } catch (IOException e) {
+            } catch (IOException | org.apache.hc.core5.http.HttpException e) {
                 throw new IllegalStateException("Can't execute get", e);
             } finally {
                 countDown.countDown();
@@ -159,7 +163,7 @@ public void run() {
     }
 
     @Test
-    public void redirect() throws IOException {
+    public void redirect() throws IOException, org.apache.hc.core5.http.HttpException {
 
         onRequest()
             .havingMethodEqualTo("GET")
@@ -196,7 +200,7 @@ public void redirect() throws IOException {
     }
 
     @Test
-    public void getProjectOkNoTtRefresh() throws IOException {
+    public void getProjectOkNoTtRefresh() throws IOException, org.apache.hc.core5.http.HttpException {
         onRequest()
             .havingMethodEqualTo("GET")
             .havingPathEqualTo(REDIRECT_PATH)
@@ -216,44 +220,33 @@ public void getProjectOkNoTtRefresh() throws IOException {
     }
 
     @Test
-    public void shouldLogoutOk()  throws IOException {
+    public void shouldLogoutOk()  throws IOException, org.apache.hc.core5.http.HttpException {
+        // Setup mocks to trigger authentication, then test logout
         mock401OnProjects();
         mock200OnProjects();
-
+        
         mock401OnToken();
         mock200OnToken();
 
         mockLogin();
 
         mockLogout("profileId");
-    // Mock for the DELETE logout request
-    // This ensures that a DELETE to /gdc/account/login/profileId returns HTTP 204 (No Content)
         onRequest()
             .havingMethodEqualTo("DELETE")
             .havingPathEqualTo("/gdc/account/login/profileId")
             .respond()
             .withStatus(204);
-    // Mock for the GET request after redirect
-    // This ensures GET on REDIRECT_PATH returns 200 with a valid JSON body
-        onRequest()
-            .havingMethodEqualTo("GET")
-            .havingPathEqualTo(REDIRECT_PATH)
-            .respond()
-            .withStatus(200)
-            .withBody(BODY_PROJECTS)
-            .withEncoding(CHARSET)
-            .withContentType(CONTENT_TYPE_JSON_UTF);
 
         final GoodDataHttpClient client = createGoodDataClient(jadlerLogin, jadlerPassword, jadlerHost);
 
         try {
-            // Perform the GET request and expect HTTP 200 OK
-            performGet(client, jadlerHost, REDIRECT_PATH, HttpStatus.SC_OK);
+            // Request to GDC_PROJECTS_PATH will trigger 401, authenticate, then return 200
+            performGet(client, jadlerHost, GDC_PROJECTS_PATH, HttpStatus.SC_OK);
         } catch (IOException e) {
             throw new RuntimeException("GET request failed", e);
         }
 
-    // Test the logout operation and expect HTTP 204 No Content
+        // Now logout - SST and TT should be set from the authentication above
         logout(client, jadlerHost, "profileId", HttpStatus.SC_NO_CONTENT);
     }