fixed integ tests

Signed-off-by: Kenrick Yap <[email protected]>

Author: kenrickyap

core/src/main/java/org/opensearch/sql/expression/json/JsonFunctions.java

@@ -40,6 +40,6 @@ private DefaultFunctionResolver jsonFunction() {
   private DefaultFunctionResolver jsonExtract() {
     return define(
         BuiltinFunctionName.JSON_EXTRACT.getName(),
-        impl(nullMissingHandling(JsonUtils::extractJson), UNDEFINED, STRING, STRING));
+        impl(JsonUtils::extractJson, UNDEFINED, STRING, STRING));
   }
 }

core/src/main/java/org/opensearch/sql/utils/JsonUtils.java

@@ -72,15 +72,9 @@ public static ExprValue extractJson(ExprValue json, ExprValue path) {
       List<String> resultPaths = JsonPath.using(config).parse(jsonString).read(jsonPath);
 
       List<ExprValue> elements = new LinkedList<>();
-
       for (String resultPath : resultPaths) {
         Object result = JsonPath.parse(jsonString).read(resultPath);
-        String resultJsonString = new ObjectMapper().writeValueAsString(result);
-        try {
-          elements.add(processJsonNode(jsonStringToNode(resultJsonString)));
-        } catch (SemanticCheckException e) {
-          elements.add(new ExprStringValue(resultJsonString));
-        }
+        elements.add(ExprValueUtils.fromObjectValue(result));
       }
 
       if (elements.size() == 1) {
@@ -90,7 +84,7 @@ public static ExprValue extractJson(ExprValue json, ExprValue path) {
       }
     } catch (PathNotFoundException e) {
       return LITERAL_NULL;
-    } catch (InvalidJsonException | JsonProcessingException e) {
+    } catch (InvalidJsonException e) {
       final String errorFormat = "JSON string '%s' is not valid. Error details: %s";
       throw new SemanticCheckException(String.format(errorFormat, json, e.getMessage()), e);
     }

integ-test/src/test/java/org/opensearch/sql/ppl/JsonFunctionsIT.java

@@ -110,14 +110,12 @@ public void test_json() throws IOException {
   @Test
   public void test_json_extract() throws IOException {
     JSONObject result;
-
     result =
         executeQuery(
             String.format(
-                "source=%s | where json_valid(json_string) | eval json_extract=json_extract(json_string, '$.b') | fields"
-                    + " test_name, json_extract",
+                "source=%s | where json_valid(json_string) | eval extracted=json_extract(json_string, '$.b') | fields test_name, extracted",
                 TEST_INDEX_JSON_TEST));
-    verifySchema(result, schema("test_name", null, "string"), schema("json_extract", null, "undefined"));
+    verifySchema(result, schema("test_name", null, "string"), schema("extracted", null, "undefined"));
     verifyDataRows(
         result,
         rows("json nested object", new JSONObject(Map.of("c", "3"))),