refactor: enhance JSON parsing methods in OpenAiFunctionCall and remove redundant methods from OpenAiUtils

Author: rpanackal

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiFunctionCall.java

@@ -1,5 +1,7 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import static com.sap.ai.sdk.foundationmodels.openai.OpenAiUtils.getOpenAiObjectMapper;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.annotations.Beta;
 import java.util.Map;
@@ -26,28 +28,39 @@ public class OpenAiFunctionCall implements OpenAiToolCall {
   @Nonnull String arguments;
 
   /**
-   * Returns the arguments as a {@code Map<String, Object>}.
+   * Parses the arguments, encoded as a JSON string, into a {@code Map<String, Object>}.
    *
-   * @return the parsed arguments
+   * @return a map of the arguments
    * @throws IllegalArgumentException if parsing fails
    * @since 1.7.0
    */
   @Nonnull
   public Map<String, Object> getArgumentsAsMap() throws IllegalArgumentException {
-    return OpenAiUtils.parseJson(getArguments(), new TypeReference<>() {});
+    final var typeReference = new TypeReference<Map<String, Object>>() {};
+    try {
+      return getOpenAiObjectMapper().readValue(getArguments(), typeReference);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Failed to parse JSON string to type " + typeReference.getType(), e);
+    }
   }
 
   /**
-   * Returns the arguments as an object of the specified class.
+   * Parses the arguments, encoded as a JSON string, into an object of the specified type.
    *
    * @param clazz the class to convert the arguments to
    * @param <T> the type of the class
-   * @return the arguments as an object of the specified class
+   * @return the parsed arguments as an object
    * @throws IllegalArgumentException if parsing fails
    * @since 1.7.0
    */
   @Nonnull
   public <T> T getArgumentsAsObject(@Nonnull final Class<T> clazz) throws IllegalArgumentException {
-    return OpenAiUtils.parseJson(getArguments(), clazz);
+    try {
+      return getOpenAiObjectMapper().readValue(getArguments(), clazz);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Failed to parse JSON string to class " + clazz.getTypeName(), e);
+    }
   }
 }

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiUtils.java

@@ -2,7 +2,6 @@
 
 import static com.sap.ai.sdk.core.JacksonConfiguration.getDefaultObjectMapper;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessage;
@@ -54,48 +53,4 @@ static ObjectMapper getOpenAiObjectMapper() {
             ChatCompletionsCreate200Response.class,
             JacksonMixins.DefaultChatCompletionCreate200ResponseMixIn.class);
   }
-
-  /**
-   * Parses a JSON string into an object of the specified {@code TypeReference} using the module
-   * default object mapper.
-   *
-   * @param json the JSON string to parse
-   * @param typeReference the type reference for the target type
-   * @param <T> the target type
-   * @return the parsed object
-   * @throws IllegalArgumentException if parsing fails
-   * @since 1.7.0
-   */
-  @Nonnull
-  static <T> T parseJson(@Nonnull final String json, @Nonnull final TypeReference<T> typeReference)
-      throws IllegalArgumentException {
-    try {
-      return getOpenAiObjectMapper().readValue(json, typeReference);
-    } catch (Exception e) {
-      throw new IllegalArgumentException(
-          "Failed to parse JSON string to type " + typeReference.getType(), e);
-    }
-  }
-
-  /**
-   * Parses a JSON string into an object of the specified class using the module default object
-   * mapper.
-   *
-   * @param json the JSON string to parse
-   * @param clazz the class of the target type
-   * @param <T> the target type
-   * @return the parsed object
-   * @throws IllegalArgumentException if parsing fails
-   * @since 1.7.0
-   */
-  @Nonnull
-  static <T> T parseJson(@Nonnull final String json, @Nonnull final Class<T> clazz)
-      throws IllegalArgumentException {
-    try {
-      return getOpenAiObjectMapper().readValue(json, clazz);
-    } catch (Exception e) {
-      throw new IllegalArgumentException(
-          "Failed to parse JSON string to class " + clazz.getTypeName(), e);
-    }
-  }
 }