Minor improvements

Author: MatKuhr

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

@@ -33,7 +33,6 @@
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 /** Client to execute requests to the orchestration service. */
@@ -135,16 +134,15 @@ public OrchestrationChatResponse chatCompletion(
   @Nonnull
   public CompletionPostResponse executeRequest(@Nonnull final CompletionPostRequest request)
       throws OrchestrationClientException {
-    final BasicClassicHttpRequest postRequest = new HttpPost("/completion");
+    final String jsonRequest;
     try {
-      val json = JACKSON.writeValueAsString(request);
-      log.debug("Serialized request into JSON payload: {}", json);
-      postRequest.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON));
+      jsonRequest = JACKSON.writeValueAsString(request);
+      log.debug("Serialized request into JSON payload: {}", jsonRequest);
     } catch (final JsonProcessingException e) {
       throw new OrchestrationClientException("Failed to serialize request parameters", e);
     }
 
-    return executeRequest(postRequest);
+    return executeRequest(jsonRequest);
   }
 
   /**
@@ -180,29 +178,31 @@ public OrchestrationChatResponse executeRequestFromJsonModuleConfig(
     try {
       moduleConfigJson = JACKSON.readTree(moduleConfig);
     } catch (JsonProcessingException e) {
-      throw new IllegalArgumentException("The provided module configuration is not valid JSON", e);
+      throw new IllegalArgumentException(
+          "The provided module configuration is not valid JSON: " + moduleConfig, e);
     }
     requestJson.set("orchestration_config", moduleConfigJson);
 
-    val postRequest = new HttpPost("/completion");
     final String body;
     try {
       body = JACKSON.writeValueAsString(requestJson);
     } catch (JsonProcessingException e) {
       throw new OrchestrationClientException("Failed to serialize request to JSON", e);
     }
-    postRequest.setEntity(new StringEntity(body, ContentType.APPLICATION_JSON));
-    return new OrchestrationChatResponse(executeRequest(postRequest));
+    return new OrchestrationChatResponse(executeRequest(body));
   }
 
   @Nonnull
-  CompletionPostResponse executeRequest(@Nonnull final BasicClassicHttpRequest request) {
+  CompletionPostResponse executeRequest(@Nonnull final String request) {
+    val postRequest = new HttpPost("/completion");
+    postRequest.setEntity(new StringEntity(request, ContentType.APPLICATION_JSON));
+
     try {
       val destination = deployment.get().destination();
       log.debug("Using destination {} to connect to orchestration service", destination);
       val client = ApacheHttpClient5Accessor.getHttpClient(destination);
       return client.execute(
-          request, new OrchestrationResponseHandler<>(CompletionPostResponse.class));
+          postRequest, new OrchestrationResponseHandler<>(CompletionPostResponse.class));
     } catch (NoSuchElementException
         | DestinationAccessException
         | DestinationNotFoundException

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

@@ -427,7 +427,8 @@ void testExecuteRequestFromJson() {
         }
         """;
 
-    client.executeRequestFromJsonModuleConfig(prompt, configJson);
+    var result = client.executeRequestFromJsonModuleConfig(prompt, configJson);
+    assertThat(result).isNotNull();
 
     verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(expectedJson)));
   }