From 457477895e6e61f72f4afca06d5d5bb438f90b12 Mon Sep 17 00:00:00 2001
From: Matthew Ball <mgball@uci.edu>
Date: Wed, 6 May 2026 18:12:25 -0700
Subject: [PATCH] drop duplicate JSONUtil, reuse JSONUtils.JSONToMap

---
 .../scan/json/JSONLScanSourceOpExec.scala     |  3 +-
 .../operator/source/scan/json/JSONUtil.scala  | 72 -------------------
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala

diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
index c96278c3e3d..3c47796892b 100644
--- a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
@@ -23,8 +23,7 @@ import org.apache.texera.amber.core.executor.SourceOperatorExecutor
 import org.apache.texera.amber.core.storage.DocumentFactory
 import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField
 import org.apache.texera.amber.core.tuple.TupleLike
-import org.apache.texera.amber.operator.source.scan.json.JSONUtil.JSONToMap
-import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.JSONUtils.{JSONToMap, objectMapper}
 
 import java.io.{BufferedReader, InputStreamReader}
 import java.net.URI
diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala
deleted file mode 100644
index d5c7f2b4e48..00000000000
--- a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.texera.amber.operator.source.scan.json
-
-import com.fasterxml.jackson.databind.JsonNode
-
-import scala.jdk.CollectionConverters.IteratorHasAsScala
-
-object JSONUtil {
-
-  /**
-    * this method helps convert JSON into a key-value Map. By default it will only
-    * take the first level attributes of the JSON object, and ignore nested objects
-    * and arrays. For example:
-    * input JSON {"A" : "a", "B": 1, "C": 2.3, "D" :{"some":"object"}, "E": ["1", "2"]}
-    * will be converted to Map[String, String]{"A" : "a", "B": "1", "C": "2.3"}.
-    *
-    * If flatten mode is enabled, then the nested objects and arrays will be converted
-    * to map recursively. The key will be the `parentName[index].childName`. For example:
-    * input JSON {"A" : "a", "B": 1, "C": 2.3, "D" :{"some":"object"}, "E": ["X", "Y"]}
-    * will be converted to Map[String, String]{"A" : "a", "B": "1", "C": "2.3",
-    * "D.some":"object", "E1":"X", "E2":"Y"}.
-    *
-    * @param node       the JSONNode to convert.
-    * @param flatten    a boolean to toggle flatten mode.
-    * @param parentName the parent's name to pass into children's naming conversion.
-    * @return a Map[String, String] of all the key value pairs from the given JSONNode.
-    */
-  def JSONToMap(
-      node: JsonNode,
-      flatten: Boolean = false,
-      parentName: String = ""
-  ): Map[String, String] = {
-    var result = Map[String, String]()
-    if (node.isObject) {
-      for (key <- node.fieldNames().asScala) {
-        val child: JsonNode = node.get(key)
-        val absoluteKey = (if (parentName.nonEmpty) parentName + "." else "") + key
-        if (flatten && (child.isObject || child.isArray)) {
-          result = result ++ JSONToMap(child, flatten, absoluteKey)
-        } else if (child.isValueNode) {
-          result = result + (absoluteKey -> child.asText())
-        } else {
-          // do nothing
-        }
-      }
-    } else if (node.isArray) {
-      for ((child, i) <- node.elements().asScala.zipWithIndex) {
-        result = result ++ JSONToMap(child, flatten, parentName + (i + 1))
-      }
-    }
-    result
-  }
-
-}