apply suggestions

Author: Jonas-Isr

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClient.java

@@ -129,22 +129,6 @@ public OpenAiClient withSystemPrompt(@Nonnull final String systemPrompt) {
     return this;
   }
 
-  /**
-   * Create a new OpenAI client with a custom HTTP request header added to every call made with this
-   * client
-   *
-   * @param customHeader the custom header to add
-   * @return a new client.
-   * @since 1.11.0
-   */
-  @Beta
-  @Nonnull
-  public OpenAiClient withHeader(@Nonnull final Header customHeader) {
-    final var newDestination =
-        DefaultHttpDestination.fromDestination(this.destination).header(customHeader).build();
-    return new OpenAiClient(newDestination);
-  }
-
   /**
    * Create a new OpenAI client with a custom header added to every call made with this client
    *
@@ -156,8 +140,11 @@ public OpenAiClient withHeader(@Nonnull final Header customHeader) {
   @Beta
   @Nonnull
   public OpenAiClient withHeader(@Nonnull final String key, @Nonnull final String value) {
-    final var customHeader = new Header(key, value);
-    return this.withHeader(customHeader);
+    final var newDestination =
+        DefaultHttpDestination.fromDestination(this.destination)
+            .header(new Header(key, value))
+            .build();
+    return new OpenAiClient(newDestination);
   }
 
   /**

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientTest.java

@@ -16,7 +16,6 @@
 import com.sap.ai.sdk.foundationmodels.openai.model.OpenAiChatCompletionTool;
 import com.sap.ai.sdk.foundationmodels.openai.model.OpenAiContentFilterPromptResults;
 import com.sap.ai.sdk.foundationmodels.openai.model.OpenAiEmbeddingParameters;
-import com.sap.cloud.sdk.cloudplatform.connectivity.Header;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -489,26 +488,16 @@ void testCustomHeaders() {
     final var request =
         new OpenAiChatCompletionRequest("Hello World! Why is this phrase so famous?");
 
-    var customHeader = new Header("foo", "bar");
-    final var result =
-        client.withHeader("footoo", "barzar").withHeader(customHeader).chatCompletion(request);
+    final var result = client.withHeader("foo", "bar").chatCompletion(request);
     assertThat(result).isNotNull();
 
-    var newCustomHeader = new Header("foo", "baz");
     var streamResult =
         client
-            .withHeader("footoo", "barz")
-            .withHeader(newCustomHeader)
+            .withHeader("foot", "baz")
             .streamChatCompletion("Hello World! Why is this phrase so famous?");
     assertThat(streamResult).isNotNull();
 
-    verify(
-        postRequestedFor(anyUrl())
-            .withHeader("foo", equalTo("bar"))
-            .withHeader("footoo", equalTo("barzar")));
-    verify(
-        postRequestedFor(anyUrl())
-            .withHeader("foo", equalTo("baz"))
-            .withHeader("footoo", equalTo("barz")));
+    verify(postRequestedFor(anyUrl()).withHeader("foo", equalTo("bar")));
+    verify(postRequestedFor(anyUrl()).withHeader("foot", equalTo("baz")));
   }
 }

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClient.java

@@ -24,12 +24,13 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 
 /** Client to execute requests to the orchestration service. */
 @Slf4j
+@RequiredArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 public class OrchestrationClient {
   private static final String DEFAULT_SCENARIO = "orchestration";
   private static final String COMPLETION_ENDPOINT = "/v2/completion";
@@ -66,15 +67,6 @@ public OrchestrationClient(@Nonnull final HttpDestination destination) {
     this.executor = new OrchestrationHttpExecutor(() -> destination);
   }
 
-  private OrchestrationClient(
-      @Nonnull final OrchestrationHttpExecutor executor,
-      @Nullable final List<Header> customHeaders) {
-    this.executor = executor;
-    if (customHeaders != null) {
-      this.customHeaders.addAll(customHeaders);
-    }
-  }
-
   /**
    * Convert the given prompt and config into a low-level request data object. The data object
    * allows for further customization before sending the request.
@@ -258,22 +250,9 @@ EmbeddingsPostResponse embed(@Nonnull final EmbeddingsPostRequest request)
   @Beta
   @Nonnull
   public OrchestrationClient withHeader(@Nonnull final String key, @Nonnull final String value) {
-    return this.withHeader(new Header(key, value));
-  }
-
-  /**
-   * Create a new orchestration client with a custom header added to every call made with this
-   * client
-   *
-   * @param customHeader the custom header to add
-   * @return a new client.
-   * @since 1.11.0
-   */
-  @Beta
-  @Nonnull
-  public OrchestrationClient withHeader(@Nonnull final Header customHeader) {
-    final var newClient = new OrchestrationClient(this.executor, this.customHeaders);
-    newClient.customHeaders.add(customHeader);
+    final var newClient = new OrchestrationClient(this.executor);
+    newClient.customHeaders.addAll(this.customHeaders);
+    newClient.customHeaders.add(new Header(key, value));
     return newClient;
   }
 }

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

@@ -78,7 +78,6 @@
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Cache;
 import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination;
-import com.sap.cloud.sdk.cloudplatform.connectivity.Header;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -179,30 +178,14 @@ void testCustomHeaders() {
                     .withBodyFile("templatingResponse.json")
                     .withHeader("Content-Type", "application/json")));
 
-    var customHeader = new Header("foo", "bar");
-    final var result =
-        client
-            .withHeader("footoo", "barzar")
-            .withHeader(customHeader)
-            .chatCompletion(prompt, config);
+    final var result = client.withHeader("foo", "bar").chatCompletion(prompt, config);
     assertThat(result).isNotNull();
 
-    var newCustomHeader = new Header("foo", "baz");
-    var streamResult =
-        client
-            .withHeader("footoo", "barz")
-            .withHeader(newCustomHeader)
-            .streamChatCompletion(prompt, config);
+    var streamResult = client.withHeader("foot", "baz").streamChatCompletion(prompt, config);
     assertThat(streamResult).isNotNull();
 
-    verify(
-        postRequestedFor(urlPathEqualTo("/v2/completion"))
-            .withHeader("foo", equalTo("bar"))
-            .withHeader("footoo", equalTo("barzar")));
-    verify(
-        postRequestedFor(urlPathEqualTo("/v2/completion"))
-            .withHeader("foo", equalTo("baz"))
-            .withHeader("footoo", equalTo("barz")));
+    verify(postRequestedFor(urlPathEqualTo("/v2/completion")).withHeader("foo", equalTo("bar")));
+    verify(postRequestedFor(urlPathEqualTo("/v2/completion")).withHeader("foot", equalTo("baz")));
   }
 
   @Test