Remove Spring Dependency

Author: MatKuhr

orchestration/pom.xml

@@ -89,12 +89,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-
-    <!-- TODO: only needed for JsonObjectMapperBuilder, maybe we can use Jackson natively to avoid this dependency -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
     <!-- scope "provided" -->
     <dependency>
       <groupId>org.projectlombok</groupId>

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

@@ -33,28 +33,31 @@
 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.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 /** Client to execute requests to the orchestration service. */
 @Slf4j
 public class OrchestrationClient {
   static final ObjectMapper JACKSON;
 
   static {
-    JACKSON =
-        new Jackson2ObjectMapperBuilder()
-            .modules(new JavaTimeModule())
-            .visibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
-            .visibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
-            .serializationInclusion(JsonInclude.Include.NON_NULL)
-            .mixIn(LLMModuleResult.class, JacksonMixins.LLMModuleResultMixIn.class)
-            .mixIn(
-                ModuleResultsOutputUnmaskingInner.class,
-                JacksonMixins.ModuleResultsOutputUnmaskingInnerMixIn.class)
-            .mixIn(FilterConfig.class, JacksonMixins.NoTypeInfoMixin.class)
-            .mixIn(MaskingProviderConfig.class, JacksonMixins.NoTypeInfoMixin.class)
-            .mixIn(TemplatingModuleConfig.class, JacksonMixins.NoTypeInfoMixin.class)
-            .build();
+    JACKSON = new ObjectMapper();
+    JACKSON.registerModule(new JavaTimeModule());
+
+    // Disable automatic detection of getters and setters
+    JACKSON.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE);
+    JACKSON.setVisibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE);
+
+    // Only serialize non-null values
+    JACKSON.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+    // Add mix-ins
+    JACKSON.addMixIn(LLMModuleResult.class, JacksonMixins.LLMModuleResultMixIn.class);
+    JACKSON.addMixIn(
+        ModuleResultsOutputUnmaskingInner.class,
+        JacksonMixins.ModuleResultsOutputUnmaskingInnerMixIn.class);
+    JACKSON.addMixIn(FilterConfig.class, JacksonMixins.NoTypeInfoMixin.class);
+    JACKSON.addMixIn(MaskingProviderConfig.class, JacksonMixins.NoTypeInfoMixin.class);
+    JACKSON.addMixIn(TemplatingModuleConfig.class, JacksonMixins.NoTypeInfoMixin.class);
   }
 
   @Nonnull private final Supplier<AiCoreDeployment> deployment;