Move ObjectMapper initialisation

StefanBratanov · Jan 14, 2024 · fd70402 · fd70402
1 parent 7ae2ab7
commit fd70402
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 136 deletions.
diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/AssistantsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/AssistantsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -20,12 +19,8 @@ public final class AssistantsClient extends OpenAIAssistantsClient {
   private final URI baseUrl;
 
   AssistantsClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+      URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/AudioClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/AudioClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
@@ -21,13 +20,8 @@ public final class AudioClient extends OpenAIClient {
 
   private final URI baseUrl;
 
-  AudioClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  AudioClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ChatClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ChatClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -20,13 +19,8 @@ public final class ChatClient extends OpenAIClient {
 
   private final URI endpoint;
 
-  ChatClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  ChatClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     endpoint = baseUrl.resolve(Endpoint.CHAT.getPath());
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/EmbeddingsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/EmbeddingsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -18,12 +17,8 @@ public final class EmbeddingsClient extends OpenAIClient {
   private final URI endpoint;
 
   EmbeddingsClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+      URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     endpoint = baseUrl.resolve(Endpoint.EMBEDDINCS.getPath());
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/FilesClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/FilesClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -18,13 +17,8 @@ public final class FilesClient extends OpenAIClient {
 
   private final URI baseUrl;
 
-  FilesClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  FilesClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/FineTuningClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/FineTuningClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -19,12 +18,8 @@ public final class FineTuningClient extends OpenAIClient {
   private final URI baseUrl;
 
   FineTuningClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+      URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ImagesClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ImagesClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -17,13 +16,8 @@ public final class ImagesClient extends OpenAIClient {
 
   private final URI baseUrl;
 
-  ImagesClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  ImagesClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/MessagesClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/MessagesClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -20,13 +19,8 @@ public final class MessagesClient extends OpenAIAssistantsClient {
 
   private final URI baseUrl;
 
-  MessagesClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  MessagesClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ModelsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ModelsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -18,13 +17,8 @@ public final class ModelsClient extends OpenAIClient {
 
   private final URI baseUrl;
 
-  ModelsClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  ModelsClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ModerationsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ModerationsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -17,12 +16,8 @@ public final class ModerationsClient extends OpenAIClient {
   private final URI endpoint;
 
   ModerationsClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+      URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     endpoint = baseUrl.resolve(Endpoint.MODERATIONS.getPath());
   }
 

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ObjectMapperSingleton.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ObjectMapperSingleton.java
@@ -0,0 +1,25 @@
+package io.github.stefanbratanov.jvm.openai;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+
+class ObjectMapperSingleton {
+
+  private static ObjectMapper INSTANCE;
+
+  private ObjectMapperSingleton() {}
+
+  static ObjectMapper getInstance() {
+    if (INSTANCE == null) {
+      INSTANCE = new ObjectMapper();
+      INSTANCE.registerModule(new Jdk8Module());
+      INSTANCE.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+      INSTANCE.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
+      INSTANCE.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+    }
+    return INSTANCE;
+  }
+}
diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAI.java b/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAI.java
@@ -1,10 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.util.Optional;
@@ -16,15 +11,6 @@
  */
 public final class OpenAI {
 
-  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-  static {
-    OBJECT_MAPPER.registerModule(new Jdk8Module());
-    OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    OBJECT_MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
-    OBJECT_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-  }
-
   private final AudioClient audioClient;
   private final ChatClient chatClient;
   private final EmbeddingsClient embeddingsClient;
@@ -39,22 +25,18 @@ public final class OpenAI {
   private final RunsClient runsClient;
 
   private OpenAI(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
-    audioClient = new AudioClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    chatClient = new ChatClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    embeddingsClient =
-        new EmbeddingsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    fineTuningClient =
-        new FineTuningClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    filesClient = new FilesClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    imagesClient = new ImagesClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    modelsClient = new ModelsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    moderationsClient =
-        new ModerationsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    assistantsClient =
-        new AssistantsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    threadsClient = new ThreadsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    messagesClient = new MessagesClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
-    runsClient = new RunsClient(baseUrl, apiKey, organization, httpClient, OBJECT_MAPPER);
+    audioClient = new AudioClient(baseUrl, apiKey, organization, httpClient);
+    chatClient = new ChatClient(baseUrl, apiKey, organization, httpClient);
+    embeddingsClient = new EmbeddingsClient(baseUrl, apiKey, organization, httpClient);
+    fineTuningClient = new FineTuningClient(baseUrl, apiKey, organization, httpClient);
+    filesClient = new FilesClient(baseUrl, apiKey, organization, httpClient);
+    imagesClient = new ImagesClient(baseUrl, apiKey, organization, httpClient);
+    modelsClient = new ModelsClient(baseUrl, apiKey, organization, httpClient);
+    moderationsClient = new ModerationsClient(baseUrl, apiKey, organization, httpClient);
+    assistantsClient = new AssistantsClient(baseUrl, apiKey, organization, httpClient);
+    threadsClient = new ThreadsClient(baseUrl, apiKey, organization, httpClient);
+    messagesClient = new MessagesClient(baseUrl, apiKey, organization, httpClient);
+    runsClient = new RunsClient(baseUrl, apiKey, organization, httpClient);
   }
 
   /**

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAIAssistantsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAIAssistantsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.util.Map;
@@ -12,12 +11,8 @@
  */
 class OpenAIAssistantsClient extends OpenAIClient {
 
-  OpenAIAssistantsClient(
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  OpenAIAssistantsClient(String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
   }
 
   @Override

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAIClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/OpenAIClient.java
@@ -24,16 +24,11 @@ abstract class OpenAIClient {
   private final String[] authenticationHeaders;
 
   protected final HttpClient httpClient;
-  protected final ObjectMapper objectMapper;
+  protected final ObjectMapper objectMapper = ObjectMapperSingleton.getInstance();
 
-  OpenAIClient(
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
+  OpenAIClient(String apiKey, Optional<String> organization, HttpClient httpClient) {
     this.authenticationHeaders = getAuthenticationHeaders(apiKey, organization);
     this.httpClient = httpClient;
-    this.objectMapper = objectMapper;
   }
 
   HttpRequest.Builder newHttpRequestBuilder(String... headers) {

diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/RunsClient.java b/src/main/java/io/github/stefanbratanov/jvm/openai/RunsClient.java
@@ -1,6 +1,5 @@
 package io.github.stefanbratanov.jvm.openai;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -20,13 +19,8 @@ public final class RunsClient extends OpenAIAssistantsClient {
 
   private final URI baseUrl;
 
-  RunsClient(
-      URI baseUrl,
-      String apiKey,
-      Optional<String> organization,
-      HttpClient httpClient,
-      ObjectMapper objectMapper) {
-    super(apiKey, organization, httpClient, objectMapper);
+  RunsClient(URI baseUrl, String apiKey, Optional<String> organization, HttpClient httpClient) {
+    super(apiKey, organization, httpClient);
     this.baseUrl = baseUrl;
   }