feat: [OpenAPI] ResponseMetadataListener with case insensitive header map

datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apache/ApiClient.java

@@ -93,6 +93,9 @@ public class ApiClient
     @Nullable
     private final String tempFolderPath;
 
+    @With
+    private final ResponseMetadataListener responseMetadataListener;
+
     // Methods that can have a request body
     private static final Set<Method> BODY_METHODS = Set.of(Method.POST, Method.PUT, Method.PATCH, Method.DELETE);
     private static final String DEFAULT_BASE_PATH = "http://localhost";
@@ -107,7 +110,7 @@ public class ApiClient
     @Nonnull
     public static ApiClient fromHttpClient( @Nonnull final CloseableHttpClient httpClient )
     {
-        return new ApiClient(httpClient, DEFAULT_BASE_PATH, createDefaultObjectMapper(), null);
+        return new ApiClient(httpClient, DEFAULT_BASE_PATH, createDefaultObjectMapper(), null, null);
     }
 
     /**
@@ -567,7 +570,7 @@ public <T> T invokeAPI(
 
         try {
             final HttpClientResponseHandler<T> responseHandler =
-                new DefaultApiResponseHandler<>(objectMapper, tempFolderPath, returnType);
+                new DefaultApiResponseHandler<>(objectMapper, tempFolderPath, returnType, responseMetadataListener);
             return httpClient.execute(builder.build(), context, responseHandler);
         }
         catch( IOException e ) {

datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apache/DefaultApiResponseHandler.java

@@ -20,9 +20,10 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -44,38 +45,31 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * Handles HTTP response processing for API client operations. This class encapsulates response deserialization, error
  * handling, and file download functionality.
  *
  * @param <T>
  *            The type of object to deserialize the response into
  */
+@RequiredArgsConstructor
 class DefaultApiResponseHandler<T> implements HttpClientResponseHandler<T>
 {
+    /** Jackson ObjectMapper for JSON deserialization */
+    @Nonnull
     private final ObjectMapper objectMapper;
+    /** Temporary folder path for file downloads (null for system default) */
+    @Nullable
     private final String tempFolderPath;
+    /** Type reference for response deserialization */
+    @Nonnull
     private final TypeReference<T> returnType;
 
-    /**
-     * Creates a new response handler with the specified configuration.
-     *
-     * @param objectMapper
-     *            The Jackson ObjectMapper for JSON deserialization
-     * @param tempFolderPath
-     *            The temporary folder path for file downloads (null for system default)
-     * @param returnType
-     *            The type reference for response deserialization
-     */
-    DefaultApiResponseHandler(
-        @Nonnull final ObjectMapper objectMapper,
-        @Nullable final String tempFolderPath,
-        @Nonnull final TypeReference<T> returnType )
-    {
-        this.objectMapper = objectMapper;
-        this.tempFolderPath = tempFolderPath;
-        this.returnType = returnType;
-    }
+    /** Optional listener for response metadata including status code and headers */
+    @Nullable
+    private final ResponseMetadataListener responseMetadataListener;
 
     @Nullable
     @Override
@@ -112,21 +106,25 @@ private T processResponse( @Nonnull final ClassicHttpResponse response )
             ParseException
     {
         final int statusCode = response.getCode();
+        final Map<String, List<String>> headers = transformResponseHeaders(response.getHeaders());
+        if( responseMetadataListener != null ) {
+            responseMetadataListener.onResponse(new OpenApiResponse(statusCode, headers));
+        }
+
         if( statusCode == HttpStatus.SC_NO_CONTENT ) {
             if( returnType.getType().equals(OpenApiResponse.class) ) {
-                return (T) new OpenApiResponse(statusCode, transformResponseHeaders(response.getHeaders()));
+                return (T) new OpenApiResponse(statusCode, headers);
             }
             return null;
         }
 
         if( isSuccessfulStatus(statusCode) ) {
             return deserialize(response);
         } else {
-            final Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
             final String message = new StatusLine(response).toString();
             throw new OpenApiRequestException(message)
                 .statusCode(statusCode)
-                .responseHeaders(responseHeaders)
+                .responseHeaders(headers)
                 .responseBody(EntityUtils.toString(response.getEntity()));
         }
     }
@@ -308,18 +306,11 @@ private static ContentType parseContentType( @Nonnull final String headerValue )
     @Nonnull
     private static Map<String, List<String>> transformResponseHeaders( @Nonnull final Header[] headers )
     {
-        final Map<String, List<String>> headersMap = new HashMap<>();
+        final var headersMap = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
         for( final Header header : headers ) {
-            List<String> valuesList = headersMap.get(header.getName());
-            if( valuesList != null ) {
-                valuesList.add(header.getValue());
-            } else {
-                valuesList = new ArrayList<>();
-                valuesList.add(header.getValue());
-                headersMap.put(header.getName(), valuesList);
-            }
+            headersMap.computeIfAbsent(header.getName(), k -> new ArrayList<>()).add(header.getValue());
         }
-        return headersMap;
+        return Collections.unmodifiableMap(headersMap);
     }
 
     private static boolean isSuccessfulStatus( final int statusCode )

datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apache/OpenApiResponse.java

@@ -6,25 +6,18 @@
 import javax.annotation.Nonnull;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 /**
  * Response object for Apache HTTP client OpenAPI calls containing status code and headers
  */
 @Getter
+@RequiredArgsConstructor
 public class OpenApiResponse
 {
 
     private final int statusCode;
 
     @Nonnull
     private final Map<String, List<String>> headers;
-
-    /**
-     * Create a new OpenApiResponse with status code and headers.
-     */
-    OpenApiResponse( final int statusCode, @Nonnull final Map<String, List<String>> headers )
-    {
-        this.statusCode = statusCode;
-        this.headers = Map.copyOf(headers);
-    }
 }

datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apache/ResponseMetadataListener.java

@@ -0,0 +1,7 @@
+package com.sap.cloud.sdk.services.openapi.apache;
+
+@FunctionalInterface
+public interface ResponseMetadataListener
+{
+    void onResponse( OpenApiResponse response );
+}

datamodel/openapi/openapi-core/src/test/java/com/sap/cloud/sdk/services/openapi/apiclient/ApacheApiClientResponseHandlingTest.java

@@ -0,0 +1,148 @@
+package com.sap.cloud.sdk.services.openapi.apiclient;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
+import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
+import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
+import com.sap.cloud.sdk.services.openapi.apache.Pair;
+import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
+
+import lombok.Data;
+
+@WireMockTest
+class ApacheApiClientResponseHandlingTest
+{
+    private static final String TEST_PATH = "/test";
+    private static final String TEST_RESPONSE_BODY = "{\"message\": \"success\"}";
+
+    @Test
+    void testResponseMetadataListener( final WireMockRuntimeInfo wmInfo )
+    {
+        stubFor(
+            get(urlEqualTo(TEST_PATH))
+                .willReturn(
+                    aResponse()
+                        .withStatus(200)
+                        .withHeader("x-custom-header", "some-value")
+                        .withBody(TEST_RESPONSE_BODY)));
+
+        final AtomicReference<OpenApiResponse> metadata = new AtomicReference<>();
+        final ApiClient apiClient =
+            ApiClient.create().withBasePath(wmInfo.getHttpBaseUrl()).withResponseMetadataListener(metadata::set);
+
+        final TestApi api = new TestApi(apiClient);
+        final TestResponse result = api.executeRequest();
+
+        assertThat(result).isNotNull();
+        assertThat(result.getMessage()).isEqualTo("success");
+        assertThat(metadata.get()).isNotNull();
+        assertThat(metadata.get().getStatusCode()).isEqualTo(200);
+        assertThat(metadata.get().getHeaders()).isNotEmpty();
+        assertThat(metadata.get().getHeaders()).containsKey("x-custom-header");
+
+        verify(1, getRequestedFor(urlEqualTo(TEST_PATH)));
+    }
+
+    @Test
+    void testCaseInsensitiveHeaderLookup( final WireMockRuntimeInfo wmInfo )
+    {
+        stubFor(
+            get(urlEqualTo(TEST_PATH))
+                .willReturn(
+                    aResponse()
+                        .withStatus(200)
+                        .withBody(TEST_RESPONSE_BODY)
+                        .withHeader("x-custom-header", "some-value")));
+
+        final AtomicReference<OpenApiResponse> capturedResponse = new AtomicReference<>();
+        final ApiClient apiClient =
+            ApiClient
+                .create()
+                .withBasePath(wmInfo.getHttpBaseUrl())
+                .withResponseMetadataListener(capturedResponse::set);
+
+        final TestApi api = new TestApi(apiClient);
+        api.executeRequest();
+
+        // Verify case-insensitive access works
+        final Map<String, List<String>> headers = capturedResponse.get().getHeaders();
+        assertThat(headers.get("x-custom-header")).contains("some-value");
+        assertThat(headers.get("X-Custom-Header")).contains("some-value");
+        assertThat(headers.get("X-CUSTOM-HEADER")).contains("some-value");
+    }
+
+    private static class TestApi extends BaseApi
+    {
+        private final String path;
+
+        TestApi( final ApiClient apiClient )
+        {
+            this(apiClient, TEST_PATH);
+        }
+
+        TestApi( final ApiClient apiClient, final String path )
+        {
+            super(apiClient);
+            this.path = path;
+        }
+
+        TestResponse executeRequest()
+            throws OpenApiRequestException
+        {
+            final List<Pair> localVarQueryParams = new ArrayList<>();
+            final List<Pair> localVarCollectionQueryParams = new ArrayList<>();
+            final Map<String, String> localVarHeaderParams = new HashMap<>();
+            final Map<String, Object> localVarFormParams = new HashMap<>();
+
+            final String[] localVarAccepts = { "application/json" };
+            final String localVarAccept = ApiClient.selectHeaderAccept(localVarAccepts);
+
+            final String[] localVarContentTypes = {};
+            final String localVarContentType = ApiClient.selectHeaderContentType(localVarContentTypes);
+
+            final TypeReference<TestResponse> localVarReturnType = new TypeReference<TestResponse>()
+            {
+            };
+
+            return apiClient
+                .invokeAPI(
+                    path,
+                    "GET",
+                    localVarQueryParams,
+                    localVarCollectionQueryParams,
+                    null,
+                    null,
+                    localVarHeaderParams,
+                    localVarFormParams,
+                    localVarAccept,
+                    localVarContentType,
+                    localVarReturnType);
+        }
+    }
+
+    @Data
+    private static class TestResponse
+    {
+        @JsonProperty( "message" )
+        private String message;
+    }
+}