Clean up

- Remove Generic fallback deserializer
- Beta Annotation on all concrete model classes.
- Introduce Mixin to override model annotations
- Improve variable naming

Author: rpanackal

orchestration/.openapi-generator-ignore

@@ -17,10 +17,6 @@ src/main/AndroidManifest.xml
 api/
 .openapi-generator/
 
-src/main/java/com/sap/ai/sdk/orchestration/client/model/FilterConfig.java
-src/main/java/com/sap/ai/sdk/orchestration/client/model/GroundingModuleConfigConfigFiltersInner.java
+
 src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResult.java
-src/main/java/com/sap/ai/sdk/orchestration/client/model/MaskingProviderConfig.java
 src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResultsOutputUnmaskingInner.java
-src/main/java/com/sap/ai/sdk/orchestration/client/model/TemplateRefTemplateRef.java
-src/main/java/com/sap/ai/sdk/orchestration/client/model/TemplatingModuleConfig.java

orchestration/pom.xml

@@ -129,6 +129,10 @@
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -166,11 +170,12 @@
               <configOptions>
                 <generateBuilders>true</generateBuilders>
                 <failOnUnknownProperties>false</failOnUnknownProperties>
-                <hideGenerationTimestamp>false</hideGenerationTimestamp>
+                <hideGenerationTimestamp>true</hideGenerationTimestamp>
                 <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
                 <enumUnknownDefaultCase>true</enumUnknownDefaultCase>
                 <useBeanValidation>false</useBeanValidation>
                 <useOneOfInterfaces>true</useOneOfInterfaces>
+                <additionalModelTypeAnnotations>@com.google.common.annotations.Beta</additionalModelTypeAnnotations>
               </configOptions>
               <generateModels>true</generateModels>
               <generateSupportingFiles>false</generateSupportingFiles>

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

@@ -21,29 +21,30 @@ public LLMModuleResultDeserializer() {
   /**
    * Deserialize the JSON object into one of the subtypes of the base type.
    *
-   * @param p The JSON parser.
-   * @param ctxt The deserialization context.
+   * @param parser The JSON parser.
+   * @param context The deserialization context.
    * @return The deserialized object.
    * @throws IOException If an I/O error occurs.
    */
   @Override
-  public LLMModuleResult deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+  public LLMModuleResult deserialize(JsonParser parser, DeserializationContext context)
+      throws IOException {
 
     // Check if the target type is a concrete class
-    JavaType targetType = ctxt.getContextualType();
+    JavaType targetType = context.getContextualType();
 
     if (targetType != null && !LLMModuleResult.class.equals(targetType.getRawClass())) {
       // If we're deserializing a concrete class, delegate to the default deserializer
-      JsonDeserializer<Object> defaultDeserializer = ctxt.findRootValueDeserializer(targetType);
-      return (LLMModuleResult) defaultDeserializer.deserialize(p, ctxt);
+      JsonDeserializer<Object> defaultDeserializer = context.findRootValueDeserializer(targetType);
+      return (LLMModuleResult) defaultDeserializer.deserialize(parser, context);
     }
 
     // Custom deserialization logic for LLMModuleResult interface
-    ObjectMapper mapper = (ObjectMapper) p.getCodec();
-    JsonNode root = mapper.readTree(p);
+    ObjectMapper mapper = (ObjectMapper) parser.getCodec();
+    JsonNode rootNode = mapper.readTree(parser);
 
     // Inspect the "choices" field
-    JsonNode choicesNode = root.get("choices");
+    JsonNode choicesNode = rootNode.get("choices");
 
     if (choicesNode != null && choicesNode.isArray()) {
       JsonNode firstChoice = choicesNode.get(0);
@@ -58,20 +59,20 @@ public LLMModuleResult deserialize(JsonParser p, DeserializationContext ctxt) th
         if (concreteClass != null) {
           // Deserialize into the determined concrete class
           // Create a new parser for the root node
-          JsonParser rootParser = root.traverse(mapper);
+          JsonParser rootParser = rootNode.traverse(mapper);
           rootParser.nextToken(); // Advance to the first token
 
           // Use the default deserializer for the concrete class
           JsonDeserializer<?> deserializer =
-              ctxt.findRootValueDeserializer(ctxt.constructType(concreteClass));
+              context.findRootValueDeserializer(context.constructType(concreteClass));
 
-          return (LLMModuleResult) deserializer.deserialize(rootParser, ctxt);
+          return (LLMModuleResult) deserializer.deserialize(rootParser, context);
         }
       }
     }
 
     // If unable to determine, throw an exception or handle default case
     throw new JsonMappingException(
-        p, "Unable to determine the concrete implementation of LLMModuleResult");
+        parser, "Unable to determine the concrete implementation of LLMModuleResult");
   }
 }

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

@@ -0,0 +1,7 @@
+package com.sap.ai.sdk.orchestration;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+/** Mixin to suppress @JsonTypeInfo for oneOf interfaces. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+public interface NoTypeInfoMixin {}

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

@@ -10,9 +10,14 @@
 import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostResponse;
+import com.sap.ai.sdk.orchestration.client.model.FilterConfig;
+import com.sap.ai.sdk.orchestration.client.model.GroundingModuleConfigConfigFiltersInner;
 import com.sap.ai.sdk.orchestration.client.model.LLMModuleResult;
+import com.sap.ai.sdk.orchestration.client.model.MaskingProviderConfig;
 import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig;
+import com.sap.ai.sdk.orchestration.client.model.TemplateRefTemplateRef;
+import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationNotFoundException;
@@ -41,8 +46,12 @@ public class OrchestrationClient {
             .visibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
             .visibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
             .serializationInclusion(JsonInclude.Include.NON_NULL)
-            .deserializerByType(
-                LLMModuleResult.class, new GeneralizedFallbackDeserializer<>(LLMModuleResult.class))
+            .deserializerByType(LLMModuleResult.class, new LLMModuleResultDeserializer())
+            .mixIn(FilterConfig.class, NoTypeInfoMixin.class)
+            .mixIn(GroundingModuleConfigConfigFiltersInner.class, NoTypeInfoMixin.class)
+            .mixIn(MaskingProviderConfig.class, NoTypeInfoMixin.class)
+            .mixIn(TemplateRefTemplateRef.class, NoTypeInfoMixin.class)
+            .mixIn(TemplatingModuleConfig.class, NoTypeInfoMixin.class)
             .build();
   }
 

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

@@ -24,27 +24,25 @@
   AzureContentSafety.JSON_PROPERTY_SEXUAL,
   AzureContentSafety.JSON_PROPERTY_VIOLENCE
 })
+@com.google.common.annotations.Beta
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class AzureContentSafety {
   public static final String JSON_PROPERTY_HATE = "Hate";
-  public static final String JSON_PROPERTY_SELF_HARM = "SelfHarm";
-  public static final String JSON_PROPERTY_SEXUAL = "Sexual";
-  public static final String JSON_PROPERTY_VIOLENCE = "Violence";
   private AzureThreshold hate;
+
+  public static final String JSON_PROPERTY_SELF_HARM = "SelfHarm";
   private AzureThreshold selfHarm;
+
+  public static final String JSON_PROPERTY_SEXUAL = "Sexual";
   private AzureThreshold sexual;
+
+  public static final String JSON_PROPERTY_VIOLENCE = "Violence";
   private AzureThreshold violence;
 
   public AzureContentSafety() {}
 
-  /** Create a builder with no initialized field. */
-  public static AzureContentSafety.Builder builder() {
-    return new AzureContentSafety.Builder();
-  }
-
   public AzureContentSafety hate(AzureThreshold hate) {
 
     this.hate = hate;
@@ -183,15 +181,6 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
-  /** Create a builder with a shallow copy of this instance. */
-  public AzureContentSafety.Builder toBuilder() {
-    return new AzureContentSafety.Builder()
-        .hate(getHate())
-        .selfHarm(getSelfHarm())
-        .sexual(getSexual())
-        .violence(getViolence());
-  }
-
   public static class Builder {
 
     private AzureContentSafety instance;
@@ -243,4 +232,18 @@ public String toString() {
       return getClass() + "=(" + instance + ")";
     }
   }
+
+  /** Create a builder with no initialized field. */
+  public static AzureContentSafety.Builder builder() {
+    return new AzureContentSafety.Builder();
+  }
+
+  /** Create a builder with a shallow copy of this instance. */
+  public AzureContentSafety.Builder toBuilder() {
+    return new AzureContentSafety.Builder()
+        .hate(getHate())
+        .selfHarm(getSelfHarm())
+        .sexual(getSexual())
+        .violence(getViolence());
+  }
 }