Resolve Jar Hell with newest versions and jakarta dependencies

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Apr 3, 2024 · 2a2daab · 2a2daab
1 parent f48cd92
commit 2a2daab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -175,10 +175,9 @@ dependencies {
     implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.1'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
     api "org.apache.httpcomponents.core5:httpcore5:5.2.2"
-    implementation "jakarta.json:jakarta.json-api:2.0.1"
-    implementation "jakarta.json.bind:jakarta.json.bind-api:2.0.0"
-    implementation ("org.eclipse:yasson:2.0.2")
-
+    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,11 +8,6 @@
  */
 package org.opensearch.flowframework.util;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.JsonbBuilder;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.Client;
@@ -48,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;
@@ -59,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
      *
@@ -416,17 +411,11 @@ 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 Exception {
-        Jsonb jsonb = JsonbBuilder.create();
-        try {
-            // Convert the map to a JSON string
-            String jsonString = jsonb.toJson(map);
-            return jsonString;
-        } finally {
-            // Close the Jsonb instance
-            jsonb.close();
+        try (Jsonb jsonb = JsonbBuilder.create()) {
+            return jsonb.toJson(map);
         }
     }
 
@@ -435,12 +424,15 @@ public static String parseArbitraryStringToObjectMapToString(Map<String, Object>
      *
      * @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;
+        }
     }
 
     /**