Fix merge conflicts and tests

Signed-off-by: Andrew Carbonetto <[email protected]>

Author: acarbonetto

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

@@ -56,12 +56,6 @@ private DefaultFunctionResolver jsonFunction() {
         impl(nullMissingHandling(JsonUtils::castJson), UNDEFINED, STRING));
   }
 
-  private DefaultFunctionResolver jsonFunction() {
-    return define(
-        BuiltinFunctionName.JSON.getName(),
-        impl(nullMissingHandling(JsonUtils::castJson), UNDEFINED, STRING));
-  }
-
   /** Creates a JSON Object/tuple expr from a given list of kv pairs. */
   private static FunctionResolver jsonObject() {
     return new FunctionResolver() {

core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java

@@ -41,8 +41,6 @@ public class JsonFunctionsTest {
   public void json_valid_returns_false() {
     List<LiteralExpression> expressions =
         List.of(
-            DSL.literal(LITERAL_MISSING), // missing returns false
-            DSL.literal(LITERAL_NULL), // null returns false
             DSL.literal("invalid"), // invalid type
             DSL.literal("{{[}}"), // missing bracket
             DSL.literal("[}"), // missing bracket
@@ -192,118 +190,6 @@ void json_returnsScalar() {
     assertEquals(LITERAL_NULL, DSL.stringToJson(DSL.literal("")).valueOf());
   }
 
-  @Test
-  void json_returnsSemanticCheckException() {
-    List<LiteralExpression> expressions =
-        List.of(
-            DSL.literal("invalid"), // invalid type
-            DSL.literal("{{[}}"), // missing bracket
-            DSL.literal("[}"), // missing bracket
-            DSL.literal("}"), // missing bracket
-            DSL.literal("\"missing quote"), // missing quote
-            DSL.literal("abc"), // not a type
-            DSL.literal("97ab"), // not a type
-            DSL.literal("{1, 2, 3, 4}"), // invalid object
-            DSL.literal("{123: 1, true: 2, null: 3}"), // invalid object
-            DSL.literal("{\"invalid\":\"json\", \"string\"}"), // invalid object
-            DSL.literal("[\"a\": 1, \"b\": 2]") // invalid array
-            );
-
-    expressions.stream()
-        .forEach(
-            expr ->
-                assertThrows(
-                    SemanticCheckException.class,
-                    () -> DSL.castJson(expr).valueOf(),
-                    "Expected to throw SemanticCheckException when calling castJson with " + expr));
-  }
-
-  @Test
-  void json_returnsJsonObject() {
-    FunctionExpression exp;
-
-    // Setup
-    final String objectJson =
-        "{\"foo\": \"foo\", \"fuzz\": true, \"bar\": 1234, \"bar2\": 12.34, \"baz\": null, "
-            + "\"obj\": {\"internal\": \"value\"}, \"arr\": [\"string\", true, null]}";
-
-    LinkedHashMap<String, ExprValue> objectMap = new LinkedHashMap<>();
-    objectMap.put("foo", new ExprStringValue("foo"));
-    objectMap.put("fuzz", ExprBooleanValue.of(true));
-    objectMap.put("bar", new ExprLongValue(1234));
-    objectMap.put("bar2", new ExprDoubleValue(12.34));
-    objectMap.put("baz", ExprNullValue.of());
-    objectMap.put(
-        "obj", ExprTupleValue.fromExprValueMap(Map.of("internal", new ExprStringValue("value"))));
-    objectMap.put(
-        "arr",
-        new ExprCollectionValue(
-            List.of(new ExprStringValue("string"), ExprBooleanValue.of(true), ExprNullValue.of())));
-    ExprValue expectedTupleExpr = ExprTupleValue.fromExprValueMap(objectMap);
-
-    // exercise
-    exp = DSL.stringToJson(DSL.literal(objectJson));
-
-    // Verify
-    var value = exp.valueOf();
-    assertTrue(value instanceof ExprTupleValue);
-    assertEquals(expectedTupleExpr, value);
-
-    // also test the empty object case
-    assertEquals(
-        ExprTupleValue.fromExprValueMap(Map.of()), DSL.stringToJson(DSL.literal("{}")).valueOf());
-  }
-
-  @Test
-  void json_returnsJsonArray() {
-    FunctionExpression exp;
-
-    // Setup
-    final String arrayJson = "[\"foo\", \"fuzz\", true, \"bar\", 1234, 12.34, null]";
-    ExprValue expectedArrayExpr =
-        new ExprCollectionValue(
-            List.of(
-                new ExprStringValue("foo"),
-                new ExprStringValue("fuzz"),
-                LITERAL_TRUE,
-                new ExprStringValue("bar"),
-                new ExprIntegerValue(1234),
-                new ExprDoubleValue(12.34),
-                LITERAL_NULL));
-
-    // exercise
-    exp = DSL.stringToJson(DSL.literal(arrayJson));
-
-    // Verify
-    var value = exp.valueOf();
-    assertTrue(value instanceof ExprCollectionValue);
-    assertEquals(expectedArrayExpr, value);
-
-    // also test the empty-array case
-    assertEquals(new ExprCollectionValue(List.of()), DSL.stringToJson(DSL.literal("[]")).valueOf());
-  }
-
-  @Test
-  void json_returnsScalar() {
-    assertEquals(
-        new ExprStringValue("foobar"), DSL.stringToJson(DSL.literal("\"foobar\"")).valueOf());
-
-    assertEquals(new ExprIntegerValue(1234), DSL.stringToJson(DSL.literal("1234")).valueOf());
-
-    assertEquals(new ExprDoubleValue(12.34), DSL.stringToJson(DSL.literal("12.34")).valueOf());
-
-    assertEquals(LITERAL_TRUE, DSL.stringToJson(DSL.literal("true")).valueOf());
-    assertEquals(LITERAL_FALSE, DSL.stringToJson(DSL.literal("false")).valueOf());
-
-    assertEquals(LITERAL_NULL, DSL.stringToJson(DSL.literal("null")).valueOf());
-
-    assertEquals(LITERAL_NULL, DSL.stringToJson(DSL.literal(LITERAL_NULL)).valueOf());
-
-    assertEquals(LITERAL_MISSING, DSL.stringToJson(DSL.literal(LITERAL_MISSING)).valueOf());
-
-    assertEquals(LITERAL_NULL, DSL.stringToJson(DSL.literal("")).valueOf());
-  }
-
   @Test
   void json_returnsSemanticCheckException() {
     // invalid type

core/src/test/java/org/opensearch/sql/expression/operator/convert/TypeCastOperatorTest.java

@@ -354,14 +354,6 @@ void castUndefinedToBoolean() {
     assertEquals(ExprBooleanValue.of(true), expression.valueOf());
   }
 
-  @Test
-  void castUndefinedToBoolean() {
-    // json cast is an UNDEFINED type expression
-    FunctionExpression expression = DSL.castBoolean(DSL.castJson(DSL.literal("true")));
-    assertEquals(BOOLEAN, expression.type());
-    assertEquals(ExprBooleanValue.of(true), expression.valueOf());
-  }
-
   @Test
   void castToDate() {
     FunctionExpression expression = DSL.castDate(DSL.literal("2012-08-07"));