Doing Unit Test and moving method to Prompt Registry.

Author: n-o-u-r-h-a-n

…k/prompt/registry/spring/SpringUtil.java …t/registry/spring/SpringAiConverter.javacore-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/spring/SpringUtil.java renamed to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/spring/SpringAiConverter.java core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/spring/SpringUtil.java renamed to core-services/prompt-registry/src/main/java/com/sap/ai/sdk/prompt/registry/spring/SpringAiConverter.java

@@ -12,9 +12,9 @@
 import org.springframework.ai.chat.messages.UserMessage;
 
 /** Utility class for orchestration-related operations in a Spring context. */
-public class SpringUtil {
+public class SpringAiConverter {
 
-  private SpringUtil() {
+  private SpringAiConverter() {
     // Utility class, no instantiation allowed
   }
 
@@ -25,7 +25,7 @@ private SpringUtil() {
    * @return list of SpringAI messages.
    */
   @Nonnull
-  public static List<Message> promptRegistryToSpringAi(
+  public static List<Message> promptTemplateToMessages(
       @Nonnull final PromptTemplateSubstitutionResponse promptResponse) {
 
     val res = promptResponse.getParsedPrompt();

…ompt/registry/spring/SpringUtilTest.java …gistry/spring/SpringAiConverterTest.javacore-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/spring/SpringUtilTest.java renamed to core-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/spring/SpringAiConverterTest.java core-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/spring/SpringUtilTest.java renamed to core-services/prompt-registry/src/test/java/com/sap/ai/sdk/prompt/registry/spring/SpringAiConverterTest.java

@@ -19,7 +19,7 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SpringUtilTest {
+public class SpringAiConverterTest {
   @RegisterExtension
   private static final WireMockExtension WM =
       WireMockExtension.newInstance().options(wireMockConfig().dynamicPort()).build();
@@ -40,7 +40,7 @@ void testPipelines() {
             PromptTemplateSubstitutionRequest.create()
                 .inputParams(Map.of("inputExample", "I love football")));
 
-    List<Message> messages = SpringUtil.promptRegistryToSpringAi(promptResponse);
+    List<Message> messages = SpringAiConverter.promptTemplateToMessages(promptResponse);
     assertThat(messages)
         .isEqualTo(
             List.of(

orchestration/pom.xml

@@ -8,8 +8,7 @@
   </parent>
   <artifactId>orchestration</artifactId>
   <name>Orchestration client</name>
-  <description>SAP Cloud SDK for AI is the official Software Development Kit (SDK) for SAP AI Core, SAP Generative AI
-        Hub, and Orchestration Service. This is the client for the Orchestration Service.</description>
+  <description>SAP Cloud SDK for AI is the official Software Development Kit (SDK) for SAP AI Core, SAP Generative AI Hub, and Orchestration Service. This is the client for the Orchestration Service.</description>
 
   <url>https://github.com/SAP/ai-sdk-java?tab=readme-ov-file#documentation</url>
   <organization>
@@ -37,12 +36,12 @@
   </scm>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>79%</coverage.complexity>
-    <coverage.line>93%</coverage.line>
-    <coverage.instruction>92%</coverage.instruction>
-    <coverage.branch>70%</coverage.branch>
+    <coverage.complexity>80%</coverage.complexity>
+    <coverage.line>94%</coverage.line>
+    <coverage.instruction>94%</coverage.instruction>
+    <coverage.branch>75%</coverage.branch>
     <coverage.method>93%</coverage.method>
-    <coverage.class>97%</coverage.class>
+    <coverage.class>100%</coverage.class>
   </properties>
 
   <dependencies>
@@ -162,10 +161,6 @@
       <!-- optional is only set to satisfy our enforcer rule, it doesn't matter for test dependencies -->
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>com.sap.ai.sdk</groupId>
-      <artifactId>prompt-registry</artifactId>
-    </dependency>
   </dependencies>
 
   <profiles>

orchestration/src/main/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatModel.java

@@ -64,6 +64,7 @@ public OrchestrationChatModel(@Nonnull final OrchestrationClient client) {
   @Override
   public ChatResponse call(@Nonnull final Prompt prompt) {
     if (prompt.getOptions() instanceof OrchestrationChatOptions options) {
+
       val orchestrationPrompt = toOrchestrationPrompt(prompt);
       val response =
           new OrchestrationSpringChatResponse(

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

@@ -17,26 +17,22 @@
 import java.util.List;
 import java.util.Map;
 
-import com.sap.ai.sdk.prompt.registry.spring.SpringUtil;
+import com.sap.ai.sdk.prompt.registry.spring.SpringAiConverter;
 import lombok.val;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Nullable;
-
 /** Endpoint for Prompt Registry operations */
 @SuppressWarnings("unused") // debug class that doesn't need to be tested
 @RestController
@@ -137,7 +133,7 @@ Generation promptRegistryToSpringAi() {
                 PromptTemplateSubstitutionRequest.create()
                     .inputParams(Map.of("inputExample", "I love football")));
 
-    List<Message> messages = SpringUtil.promptRegistryToSpringAi(promptResponse);
+    List<Message> messages = SpringAiConverter.promptTemplateToMessages(promptResponse);
     val prompt = new Prompt(messages);
     val response = cl.prompt(prompt).call().chatResponse();
     return response != null ? response.getResult() : null;

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

@@ -15,9 +15,7 @@
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatModel;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatOptions;
-import com.sap.ai.sdk.prompt.registry.PromptClient;
-import com.sap.ai.sdk.prompt.registry.model.PromptTemplateSubstitutionRequest;
-import com.sap.ai.sdk.prompt.registry.spring.SpringUtil;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -28,7 +26,6 @@
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;
-import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatModel;