fix: Removed Javascript from Spring application (#306)

* fix: Removed Javascript from Spring application

* Added form

* Added JSON/Message form back

* Fix

* forgor

Author: CharlesDuboisSAP

docs/guides/OPENAI_CHAT_COMPLETION.md

@@ -122,7 +122,7 @@ var result = OpenAiClient.forModel(GPT_35_TURBO).chatCompletion(request);
 String resultMessage = result.getContent();
 ```
 
-See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java)
+See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java)
 
 ## Chat Completion with Specific Model Version
 
@@ -205,7 +205,7 @@ Integer tokensUsed = totalOutput.getUsage().getCompletionTokens();
 System.out.println("Tokens used: " + tokensUsed);
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java). It shows the usage of Spring
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java). It shows the usage of Spring
 Boot's `ResponseBodyEmitter` to stream the chat completion delta messages to the frontend in real-time.
 
 ## Embedding
@@ -218,4 +218,4 @@ var request = new OpenAiEmbeddingParameters().setInput("Hello World");
 OpenAiEmbeddingOutput embedding = OpenAiClient.forModel(TEXT_EMBEDDING_ADA_002).embedding(request);
 ```
 
-See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java)
+See [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiService.java)

docs/guides/ORCHESTRATION_CHAT_COMPLETION.md

@@ -83,7 +83,7 @@ var config = new OrchestrationModuleConfig()
         .withLlmConfig(OrchestrationAiModel.GPT_4O);
 ```
 
-Please also refer to [our sample code](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java) for this and all following code examples.
+Please also refer to [our sample code](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java) for this and all following code examples.
 
 ## Chat Completion
 
@@ -176,7 +176,7 @@ var result =
   The convenience method `getContent()` on the resulting object will throw an `OrchestrationClientException` upon invocation.
   The low level API under `getOriginalResponse()` will not throw an exception.
 
-You will find [some examples](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java) in our Spring Boot application demonstrating response handling with filters.
+You will find [some examples](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java) in our Spring Boot application demonstrating response handling with filters.
 
 ## Data masking
 
@@ -253,7 +253,7 @@ try (Stream<String> stream = client.streamChatCompletion(prompt, config)) {
 }
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java).
 It shows the usage of Spring Boot's `ResponseBodyEmitter` to stream the chat completion delta messages to the frontend in real-time.
 
 ## Set model parameters

docs/guides/SPRING_AI_INTEGRATION.md

@@ -50,7 +50,7 @@ Prompt prompt = new Prompt("What is the capital of France?", opts);
 ChatResponse response = client.call(prompt);
 ```
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).
 
 ## Orchestration Masking
 
@@ -74,7 +74,7 @@ ChatResponse response = client.call(prompt);
 ```
 
 Please
-find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).
 
 ## Stream chat completion
 
@@ -98,4 +98,4 @@ Flux<String> responseFlux =
 
 _Note: A Spring endpoint can return `Flux` instead of `ResponseEntity`._
 
-Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java).
+Please find [an example in our Spring Boot application](../../sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java).

sample-code/spring-app/pom.xml

@@ -118,10 +118,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
     <!-- scope "runtime" -->
     <dependency>
       <groupId>ch.qos.logback</groupId>

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java

@@ -1,15 +1,34 @@
 package com.sap.ai.sdk.app;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sap.ai.sdk.orchestration.OrchestrationJacksonConfiguration;
+import javax.annotation.Nonnull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Primary;
 
 /** Main class to start the Spring Boot application. */
 @SpringBootApplication
 @ComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 @ServletComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 public class Application {
+
+  /**
+   * Temporary workaround to fix the issue with the Orchestration spec.
+   *
+   * @return a modified object mapper that works for Orchestration.
+   */
+  @Bean
+  @Primary
+  @SuppressWarnings("unused")
+  @Nonnull
+  public ObjectMapper objectMapper() {
+    return OrchestrationJacksonConfiguration.getOrchestrationObjectMapper();
+  }
+
   /**
    * Main method to start the Spring Boot application.
    *

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/ControllerExceptionHandler.java

@@ -14,7 +14,7 @@
 class ControllerExceptionHandler {
   /** Exceptions thrown by the Spring Boot controllers are turned into a readable text response. */
   @ExceptionHandler(Exception.class)
-  ResponseEntity<String> handleError(final Exception ex) {
+  Object handleError(final Exception ex) {
     final var headers = new HttpHeaders();
     headers.setContentType(MediaType.TEXT_PLAIN);
 

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/ConfigurationController.java

@@ -4,9 +4,8 @@
 import com.sap.ai.sdk.core.model.AiConfiguration;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /** Endpoint for Configuration operations */
@@ -16,23 +15,17 @@ class ConfigurationController {
 
   private static final ConfigurationApi CLIENT = new ConfigurationApi();
 
-  /**
-   * Get the list of configurations.
-   *
-   * @param accept the accept header
-   * @return a response entity with a string representation of the list of configurations
-   */
   @GetMapping("/configurations")
-  ResponseEntity<Object> getConfigurations(
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+  Object getConfigurations(
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final var configList = CLIENT.query("default");
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(configList);
+    if ("json".equals(format)) {
+      return configList;
     }
     final var items =
         configList.getResources().stream()
             .map(AiConfiguration::getName)
             .collect(Collectors.joining(", "));
-    return ResponseEntity.ok("The following configurations are available: %s.".formatted(items));
+    return "The following configurations are available: %s.".formatted(items);
   }
 }

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/DeploymentController.java

@@ -22,8 +22,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /** Endpoints for AI Core AiDeployment operations */
@@ -36,12 +36,7 @@ class DeploymentController {
   private static final DeploymentApi CLIENT = new DeploymentApi();
   private static final String RESOURCE_GROUP = "default";
 
-  /**
-   * Create and delete a deployment with the Java specific configuration ID.
-   *
-   * @param configId The configuration id.
-   * @return the deployment deletion response
-   */
+  /** Create and delete a deployment with the Java specific configuration ID. */
   @Nullable
   AiDeploymentDeletionResponse createAndDeleteDeploymentByConfigId(final String configId) {
     final var deployment =
@@ -53,20 +48,14 @@ AiDeploymentDeletionResponse createAndDeleteDeploymentByConfigId(final String co
     return CLIENT.delete(RESOURCE_GROUP, deployment.getId());
   }
 
-  /**
-   * Create and delete a deployment with the Java specific configuration ID.
-   *
-   * @param configId The configuration id.
-   * @param accept The accept header.
-   * @return a response entity with a string representation of the deployment creation response
-   */
+  /** Create and delete a deployment with the Java specific configuration ID. */
   @GetMapping("/by-config/{id}/createDelete")
-  ResponseEntity<Object> createAndDeleteDeploymentByConfigId(
+  Object createAndDeleteDeploymentByConfigId(
       @Nonnull @PathVariable("id") final String configId,
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final var response = createAndDeleteDeploymentByConfigId(configId);
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(response);
+    if ("json".equals(format)) {
+      return response;
     }
     return ResponseEntity.ok("Deployment created and will be deleted.");
   }
@@ -75,16 +64,11 @@ ResponseEntity<Object> createAndDeleteDeploymentByConfigId(
    * Stop all deployments with the Java specific configuration ID.
    *
    * <p>Only RUNNING deployments can be STOPPED
-   *
-   * @param configId The configuration id.
-   * @param accept The accept header.
-   * @return a response entity with a string representation of the deployment modification response
    */
   @GetMapping("/by-config/{id}/stop")
-  @Nonnull
-  ResponseEntity<Object> stopByConfigId(
+  Object stopByConfigId(
       @Nonnull @PathVariable("id") final String configId,
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final List<AiDeployment> myDeployments = getAllByConfigId(configId);
     log.info("Found {} deployments to STOP", myDeployments.size());
 
@@ -96,26 +80,21 @@ ResponseEntity<Object> stopByConfigId(
             .map(id -> CLIENT.modify(RESOURCE_GROUP, id, modificationRequest))
             .toList();
 
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(stoppedDeployments);
+    if ("json".equals(format)) {
+      return stoppedDeployments;
     }
-    return ResponseEntity.ok("Deployments under the given config ID stopped.");
+    return "Deployments under the given config ID stopped.";
   }
 
   /**
    * Delete all deployments with the Java specific configuration ID.
    *
    * <p>Only UNKNOWN and STOPPED deployments can be DELETED
-   *
-   * @param configId The configuration id.
-   * @param accept The accept header.
-   * @return a response entity with a string representation of the deployment deletion response
    */
   @GetMapping("/by-config/{id}/delete")
-  @Nonnull
-  ResponseEntity<Object> deleteByConfigId(
+  Object deleteByConfigId(
       @Nonnull @PathVariable("id") final String configId,
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final List<AiDeployment> myDeployments = getAllByConfigId(configId);
     log.info("Found {} deployments to DELETE", myDeployments.size());
 
@@ -124,40 +103,27 @@ ResponseEntity<Object> deleteByConfigId(
         myDeployments.stream()
             .map(deployment -> CLIENT.delete(RESOURCE_GROUP, deployment.getId()))
             .toList();
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(responseList);
+    if ("json".equals(format)) {
+      return responseList;
     }
-    return ResponseEntity.ok("Deployments under the given config ID deleted.");
+    return "Deployments under the given config ID deleted.";
   }
 
-  /**
-   * Get all deployments with the Java specific configuration ID.
-   *
-   * @param configId The configuration id.
-   * @param accept The accept header.
-   * @return a response entity with a string representation of the Java specific deployments
-   */
+  /** Get all deployments with the Java specific configuration ID. */
   @GetMapping("/by-config/{id}/getAll")
-  ResponseEntity<Object> getAllByConfigId(
+  Object getAllByConfigId(
       @Nonnull @PathVariable("id") final String configId,
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+      @Nullable @RequestParam(value = "format", required = false) final String format) {
     final var deployments = getAllByConfigId(configId);
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(deployments);
+    if ("json".equals(format)) {
+      return deployments;
     }
     final var items =
         deployments.stream().map(AiDeployment::getId).collect(Collectors.joining(", "));
-    return ResponseEntity.ok(
-        "The following Java-specific deployments are available: %s.".formatted(items));
+    return "The following Java-specific deployments are available: %s.".formatted(items);
   }
 
-  /**
-   * Get all deployments with the Java specific configuration ID.
-   *
-   * @param configId The configuration id.
-   * @return the Java specific deployments
-   */
-  @Nonnull
+  /** Get all deployments with the Java specific configuration ID. */
   List<AiDeployment> getAllByConfigId(@Nonnull @PathVariable("id") final String configId) {
     final AiDeploymentList deploymentList = CLIENT.query(RESOURCE_GROUP);
 
@@ -166,34 +132,23 @@ List<AiDeployment> getAllByConfigId(@Nonnull @PathVariable("id") final String co
         .toList();
   }
 
-  /**
-   * Get all deployments, including non-Java specific deployments
-   *
-   * @param accept The accept header.
-   * @return a response entity with a string representation of the Java specific deployments
-   */
+  /** Get all deployments, including non-Java specific deployments */
   @GetMapping("/getAll")
-  @Nonnull
-  ResponseEntity<Object> getAll(
-      @Nullable @RequestHeader(value = "accept", required = false) final String accept) {
+  Object getAll(@Nullable @RequestParam(value = "format", required = false) final String format) {
     final var deployments = getAll();
-    if ("application/json".equals(accept)) {
-      return ResponseEntity.ok().body(deployments);
+    if ("json".equals(format)) {
+      return deployments;
     }
     final var items =
         deployments != null
             ? deployments.getResources().stream()
                 .map(AiDeployment::getId)
                 .collect(Collectors.joining(", "))
             : "";
-    return ResponseEntity.ok("The following deployments are available: %s.".formatted(items));
+    return "The following deployments are available: %s.".formatted(items);
   }
 
-  /**
-   * Get all deployments
-   *
-   * @return all deployments
-   */
+  /** Get all deployments */
   @Nullable
   AiDeploymentList getAll() {
     return CLIENT.query(RESOURCE_GROUP);
@@ -203,9 +158,6 @@ AiDeploymentList getAll() {
    * Create a configuration, and deploy it.
    *
    * <p>This is to be invoked from a unit test.
-   *
-   * @param model The OpenAI model to deploy
-   * @return the deployment creation response
    */
   @Nonnull
   @SuppressWarnings("unused") // debug method that doesn't need to be tested