chore: Refactor the internal serialization methods

src/main/java/com/google/genai/AfcUtil.java

@@ -60,9 +60,9 @@ static GenerateContentConfig transformGenerateContentConfig(GenerateContentConfi
           config.tools().get().stream()
               .map(tool -> Transformers.tTool(tool))
               .collect(toImmutableList());
-      ObjectNode configNode = JsonSerializable.objectMapper.valueToTree(config);
-      configNode.set("tools", JsonSerializable.objectMapper.valueToTree(transformedTools));
-      transformedConfig = JsonSerializable.fromJsonNode(configNode, GenerateContentConfig.class);
+      ObjectNode configNode = Common.objectMapper.valueToTree(config);
+      configNode.set("tools", Common.objectMapper.valueToTree(transformedTools));
+      transformedConfig = Common.fromJsonNode(configNode, GenerateContentConfig.class);
     } else {
       transformedConfig = config;
     }

src/main/java/com/google/genai/AsyncBatches.java

@@ -175,14 +175,14 @@ public CompletableFuture<AsyncPager<BatchJob>> list(ListBatchJobsConfig config)
                     + requestConfig.getClass().getName());
           }
           return this.privateList((ListBatchJobsConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+              .thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<BatchJob>(
                 Pager.PagedItem.BATCH_JOBS,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 

src/main/java/com/google/genai/AsyncCaches.java

@@ -160,14 +160,14 @@ public CompletableFuture<AsyncPager<CachedContent>> list(ListCachedContentsConfi
                     + requestConfig.getClass().getName());
           }
           return this.privateList((ListCachedContentsConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+              .thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<CachedContent>(
                 Pager.PagedItem.CACHED_CONTENTS,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 }

src/main/java/com/google/genai/AsyncDocuments.java

@@ -102,14 +102,14 @@ public CompletableFuture<AsyncPager<Document>> list(String parent, ListDocuments
                     + requestConfig.getClass().getName());
           }
           return this.privateList(parent, (ListDocumentsConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+              .thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<Document>(
                 Pager.PagedItem.DOCUMENTS,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 }

src/main/java/com/google/genai/AsyncFileSearchStores.java

@@ -163,14 +163,14 @@ public CompletableFuture<AsyncPager<FileSearchStore>> list(ListFileSearchStoresC
                     + requestConfig.getClass().getName());
           }
           return this.privateList((ListFileSearchStoresConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+              .thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<FileSearchStore>(
                 Pager.PagedItem.FILE_SEARCH_STORES,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 

src/main/java/com/google/genai/AsyncFiles.java

@@ -157,15 +157,14 @@ public CompletableFuture<AsyncPager<File>> list(ListFilesConfig config) {
                 "Internal error: Pager expected ListFilesConfig but received "
                     + requestConfig.getClass().getName());
           }
-          return this.privateList((ListFilesConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+          return this.privateList((ListFilesConfig) requestConfig).thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<File>(
                 Pager.PagedItem.FILES,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 

src/main/java/com/google/genai/AsyncLive.java

@@ -194,7 +194,7 @@ private String getSetupRequest(String model, LiveConnectConfig config) {
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
 
     ObjectNode body;
     if (this.apiClient.vertexAI()) {
@@ -206,7 +206,7 @@ private String getSetupRequest(String model, LiveConnectConfig config) {
     // TODO: Remove the hack that removes config.
     body.remove("config");
 
-    return JsonSerializable.toJsonString(body);
+    return Common.toJsonString(body);
   }
 
   static class GenAiWebSocketClient extends WebSocketListener {
@@ -336,12 +336,12 @@ private void handleIncomingMessage(String message) {
       if (messageCallback != null) {
         try {
           LiveConverters liveConverters = new LiveConverters(this.apiClient);
-          JsonNode responseNode = JsonSerializable.stringToJsonNode(message);
+          JsonNode responseNode = Common.stringToJsonNode(message);
           if (this.apiClient.vertexAI()) {
             responseNode = liveConverters.liveServerMessageFromVertex(responseNode, null);
           }
           LiveServerMessage serverMessage =
-              JsonSerializable.fromJsonNode(responseNode, LiveServerMessage.class);
+              Common.fromJsonNode(responseNode, LiveServerMessage.class);
           messageCallback.accept(serverMessage);
         } catch (RuntimeException e) {
           logger.log(Level.SEVERE, "Error deserializing message", e);

src/main/java/com/google/genai/AsyncModels.java

@@ -108,7 +108,7 @@ CompletableFuture<GenerateContentResponse> privateGenerateContent(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateGenerateContent(model, contents, config);
     return this.apiClient
@@ -134,7 +134,7 @@ CompletableFuture<ResponseStream<GenerateContentResponse>> privateGenerateConten
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateGenerateContentStream(model, contents, config);
     return this.apiClient
@@ -170,7 +170,7 @@ CompletableFuture<EmbedContentResponse> privateEmbedContent(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateEmbedContent(
             model, contents, content, embeddingApiType, config);
@@ -198,7 +198,7 @@ CompletableFuture<GenerateImagesResponse> privateGenerateImages(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForPrivateGenerateImages(model, prompt, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -230,7 +230,7 @@ CompletableFuture<EditImageResponse> privateEditImage(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateEditImage(model, prompt, referenceImages, config);
     return this.apiClient
@@ -260,7 +260,7 @@ CompletableFuture<UpscaleImageResponse> privateUpscaleImage(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateUpscaleImage(model, image, upscaleFactor, config);
     return this.apiClient
@@ -302,7 +302,7 @@ public CompletableFuture<RecontextImageResponse> recontextImage(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForRecontextImage(model, source, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -340,7 +340,7 @@ public CompletableFuture<SegmentImageResponse> segmentImage(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForSegmentImage(model, source, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -366,7 +366,7 @@ public CompletableFuture<Model> get(String model, GetModelConfig config) {
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForGet(model, config);
     return this.apiClient
         .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -384,7 +384,7 @@ CompletableFuture<ListModelsResponse> privateList(ListModelsConfig config) {
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForPrivateList(config);
     return this.apiClient
         .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -416,7 +416,7 @@ public CompletableFuture<Model> update(String model, UpdateModelConfig config) {
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForUpdate(model, config);
     return this.apiClient
         .asyncRequest("patch", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -442,7 +442,7 @@ public CompletableFuture<DeleteModelResponse> delete(String model, DeleteModelCo
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForDelete(model, config);
     return this.apiClient
         .asyncRequest(
@@ -479,7 +479,7 @@ public CompletableFuture<CountTokensResponse> countTokens(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForCountTokens(model, contents, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -515,7 +515,7 @@ public CompletableFuture<ComputeTokensResponse> computeTokens(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = models.buildRequestForComputeTokens(model, contents, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -555,7 +555,7 @@ CompletableFuture<GenerateVideosOperation> privateGenerateVideos(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         models.buildRequestForPrivateGenerateVideos(model, prompt, image, video, source, config);
     return this.apiClient

src/main/java/com/google/genai/AsyncPager.java

@@ -67,9 +67,7 @@ public CompletableFuture<ImmutableList<T>> nextPage() {
               }
               try {
                 return asyncRequest
-                    .apply(
-                        JsonSerializable.fromJsonNode(
-                            requestConfig, pagedItem.requestConfigClass()))
+                    .apply(Common.fromJsonNode(requestConfig, pagedItem.requestConfigClass()))
                     .thenApply(
                         response -> {
                           initNewPage((JsonNode) response);

src/main/java/com/google/genai/AsyncSession.java

@@ -21,11 +21,11 @@
 import com.google.genai.types.LiveClientContent;
 import com.google.genai.types.LiveClientMessage;
 import com.google.genai.types.LiveClientToolResponse;
-import com.google.genai.types.LiveServerSetupComplete;
 import com.google.genai.types.LiveSendClientContentParameters;
 import com.google.genai.types.LiveSendRealtimeInputParameters;
 import com.google.genai.types.LiveSendToolResponseParameters;
 import com.google.genai.types.LiveServerMessage;
+import com.google.genai.types.LiveServerSetupComplete;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
@@ -105,7 +105,7 @@ public CompletableFuture<Void> sendToolResponse(LiveSendToolResponseParameters t
   private CompletableFuture<Void> send(LiveClientMessage input) {
 
     LiveConverters liveConverters = new LiveConverters(apiClient);
-    JsonNode parameterNode = JsonSerializable.toJsonNode(input);
+    JsonNode parameterNode = Common.toJsonNode(input);
 
     ObjectNode body;
     if (this.apiClient.vertexAI()) {
@@ -114,7 +114,7 @@ private CompletableFuture<Void> send(LiveClientMessage input) {
       body = liveConverters.liveClientMessageToMldev(parameterNode, null);
     }
 
-    return CompletableFuture.runAsync(() -> websocket.send(JsonSerializable.toJsonString(body)));
+    return CompletableFuture.runAsync(() -> websocket.send(Common.toJsonString(body)));
   }
 
   /**

src/main/java/com/google/genai/AsyncTunings.java

@@ -60,7 +60,7 @@ CompletableFuture<TuningJob> privateGet(String name, GetTuningJobConfig config)
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = tunings.buildRequestForPrivateGet(name, config);
     return this.apiClient
         .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -78,7 +78,7 @@ CompletableFuture<ListTuningJobsResponse> privateList(ListTuningJobsConfig confi
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = tunings.buildRequestForPrivateList(config);
     return this.apiClient
         .asyncRequest("get", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -107,7 +107,7 @@ public CompletableFuture<CancelTuningJobResponse> cancel(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest = tunings.buildRequestForCancel(name, config);
     return this.apiClient
         .asyncRequest("post", builtRequest.path(), builtRequest.body(), builtRequest.httpOptions())
@@ -139,7 +139,7 @@ CompletableFuture<TuningJob> privateTune(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         tunings.buildRequestForPrivateTune(baseModel, preTunedModel, trainingDataset, config);
     return this.apiClient
@@ -172,7 +172,7 @@ CompletableFuture<TuningOperation> privateTuneMldev(
     if (!Common.isZero(config)) {
       parameterBuilder.config(config);
     }
-    JsonNode parameterNode = JsonSerializable.toJsonNode(parameterBuilder.build());
+    JsonNode parameterNode = Common.toJsonNode(parameterBuilder.build());
     BuiltRequest builtRequest =
         tunings.buildRequestForPrivateTuneMldev(baseModel, preTunedModel, trainingDataset, config);
     return this.apiClient
@@ -207,14 +207,14 @@ public CompletableFuture<AsyncPager<TuningJob>> list(ListTuningJobsConfig config
                     + requestConfig.getClass().getName());
           }
           return this.privateList((ListTuningJobsConfig) requestConfig)
-              .thenApply(JsonSerializable::toJsonNode);
+              .thenApply(Common::toJsonNode);
         };
     return CompletableFuture.supplyAsync(
         () ->
             new AsyncPager<TuningJob>(
                 Pager.PagedItem.TUNING_JOBS,
                 request,
-                (ObjectNode) JsonSerializable.toJsonNode(finalConfig),
+                (ObjectNode) Common.toJsonNode(finalConfig),
                 request.apply(finalConfig)));
   }
 

src/main/java/com/google/genai/BasePager.java

@@ -113,13 +113,13 @@ protected void initNewPage(JsonNode response) {
     } else {
       List<T> page = new ArrayList<>();
       for (JsonNode responseItem : responseList) {
-        page.add((T) JsonSerializable.fromJsonNode(responseItem, pagedItem.itemClass()));
+        page.add((T) Common.fromJsonNode(responseItem, pagedItem.itemClass()));
       }
       this.page = ImmutableList.copyOf(page);
     }
     try {
       this.sdkHttpResponse =
-          JsonSerializable.fromJsonNode(response.get("sdkHttpResponse"), HttpResponse.class);
+          Common.fromJsonNode(response.get("sdkHttpResponse"), HttpResponse.class);
     } catch (GenAiIOException e) {
       this.sdkHttpResponse = null;
     }