[Backport-2.x] Use jsonB instead of jackson (#586) (#645)

* Use jsonB instead of jackson (#586) * Use jsonB instead of jackson Signed-off-by: Owais Kazi <[email protected]> * Resolve Jar Hell with newest versions and jakarta dependencies Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Owais Kazi <[email protected]> Signed-off-by: Daniel Widdis <[email protected]> Co-authored-by: Daniel Widdis <[email protected]> * Removed 3.x dependency Signed-off-by: owaiskazi19 <[email protected]> --------- Signed-off-by: Owais Kazi <[email protected]> Signed-off-by: Daniel Widdis <[email protected]> Signed-off-by: owaiskazi19 <[email protected]> Co-authored-by: Daniel Widdis <[email protected]>
opensearch-project · Apr 4, 2024 · c60836f · c60836f
1 parent c71020a
commit c60836f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -174,8 +174,9 @@ dependencies {
     implementation "org.opensearch:common-utils:${common_utils_version}"
     implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.1'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
-    implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
-    implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
+    implementation "jakarta.json.bind:jakarta.json.bind-api:3.0.0"
+    implementation "org.glassfish:jakarta.json:2.0.1"
+    implementation "org.eclipse:yasson:3.0.3"
 
     // ZipArchive dependencies used for integration tests
     zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}"

diff --git a/src/main/java/org/opensearch/flowframework/util/ParseUtils.java b/src/main/java/org/opensearch/flowframework/util/ParseUtils.java
@@ -8,9 +8,6 @@
  */
 package org.opensearch.flowframework.util;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.Client;
@@ -46,6 +43,9 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+
 import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.opensearch.flowframework.common.CommonValue.PARAMETERS_FIELD;
 import static org.opensearch.flowframework.common.WorkflowResources.MODEL_ID;
@@ -57,14 +57,11 @@ public class ParseUtils {
     private static final Logger logger = LogManager.getLogger(ParseUtils.class);
 
     // Matches ${{ foo.bar }} (whitespace optional) with capturing groups 1=foo, 2=bar
-    // private static final Pattern SUBSTITUTION_PATTERN = Pattern.compile("\\$\\{\\{\\s*(.+)\\.(.+?)\\s*\\}\\}");
     private static final Pattern SUBSTITUTION_PATTERN = Pattern.compile("\\$\\{\\{\\s*([\\w_]+)\\.([\\w_]+)\\s*\\}\\}");
     private static final Pattern JSON_ARRAY_DOUBLE_QUOTES_PATTERN = Pattern.compile("\"\\[(.*?)]\"");
 
     private ParseUtils() {}
 
-    private static final ObjectMapper mapper = new ObjectMapper();
-
     /**
      * Converts a JSON string into an XContentParser
      *
@@ -414,25 +411,28 @@ public static Object conditionallySubstitute(Object value, Map<String, WorkflowD
      *
      * @param map content map
      * @return instance of the string
-     * @throws JsonProcessingException JsonProcessingException from Jackson for issues processing map
+     * @throws Exception for issues processing map
      */
-    public static String parseArbitraryStringToObjectMapToString(Map<String, Object> map) throws JsonProcessingException {
-        // Convert the map to a JSON string
-        String mappedString = mapper.writeValueAsString(map);
-        return mappedString;
+    public static String parseArbitraryStringToObjectMapToString(Map<String, Object> map) throws Exception {
+        try (Jsonb jsonb = JsonbBuilder.create()) {
+            return jsonb.toJson(map);
+        }
     }
 
     /**
      * Generates a String to String map based on a Json File
      *
      * @param path file path
      * @return instance of the string
-     * @throws JsonProcessingException JsonProcessingException from Jackson for issues processing map
+     * @throws Exception for issues processing map
      */
-    public static Map<String, String> parseJsonFileToStringToStringMap(String path) throws IOException {
+    public static Map<String, String> parseJsonFileToStringToStringMap(String path) throws Exception {
         String jsonContent = resourceToString(path);
-        Map<String, String> mappedJsonFile = mapper.readValue(jsonContent, Map.class);
-        return mappedJsonFile;
+        try (Jsonb jsonb = JsonbBuilder.create()) {
+            @SuppressWarnings("unchecked")
+            Map<String, String> resultMap = jsonb.fromJson(jsonContent, Map.class);
+            return resultMap;
+        }
     }
 
     /**

diff --git a/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java b/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
@@ -84,7 +84,7 @@ public void testBuildAndParseStringToStringMap() throws IOException {
         assertEquals(stringMap.get("one"), parsedMap.get("one"));
     }
 
-    public void testParseArbitraryStringToObjectMapToString() throws IOException {
+    public void testParseArbitraryStringToObjectMapToString() throws Exception {
         Map<String, Object> map = Map.ofEntries(Map.entry("test-1", Map.of("test-1", "test-1")));
         String parsedMap = ParseUtils.parseArbitraryStringToObjectMapToString(map);
         assertEquals("{\"test-1\":{\"test-1\":\"test-1\"}}", parsedMap);