Update string type conversions in lists

ballerina-platform · Mar 27, 2024 · b4cce5c · b4cce5c
1 parent 4f3b6d5
commit b4cce5c
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 4 deletions.
diff --git a/ballerina/tests/jsonpath_complex_tests.bal b/ballerina/tests/jsonpath_complex_tests.bal
@@ -725,6 +725,84 @@ function testListOperations() returns error? {
 
     result = check read(j4, `$.a2[1][?(@.a1 in ['string', 'string2'])]`);
     test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[0][?(@.a1 in [${d1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[decimalJson]);
+
+    result = check read(j4, `$.a1[0][?(@.a2 in [${d1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[0][?(@.a1 nin [${d1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[0][?(@.a2 nin [${d1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[decimalJson]);
+
+    result = check read(j4, `$.a1[1][?(@.a1 in [${i1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[intJson]);
+
+    result = check read(j4, `$.a1[1][?(@.a2 in [${i1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[1][?(@.a1 nin [${i1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[1][?(@.a2 nin [${i1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[intJson]);
+
+    result = check read(j4, `$.a1[2][?(@.a1 in [${f1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[floatJson]);
+
+    result = check read(j4, `$.a1[2][?(@.a2 in [${f1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[2][?(@.a1 nin [${f1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a1[2][?(@.a2 nin [${f1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[floatJson]);
+
+    result = check read(j4, `$.a2[0][?(@.a1 in [1.12, null])]`);
+    test:assertEquals(result, <json[]>[nilJson]);
+
+    result = check read(j4, `$.a2[0][?(@.a4 in [12.25, null, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[0][?(@.a1 nin [3.21, null])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[0][?(@.a2 nin [1.2, 3.21])]`);
+    test:assertEquals(result, <json[]>[nilJson]);
+
+    result = check read(j4, `$.a2[0][?(@.a2 nin [])]`);
+    test:assertEquals(result, <json[]>[nilJson]);
+
+    result = check read(j4, `$.a2[0][?(@.a2 nin [])]`);
+    test:assertEquals(result, <json[]>[nilJson]);
+
+    result = check read(j4, `$.a2[1][?(@.a1 in [1.12, '${s1}'])]`);
+    test:assertEquals(result, <json[]>[stringJson]);
+
+    result = check read(j4, `$.a2[1][?(@.a2 in [12.25, ${s1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[1][?(@.a1 nin [3.21, '${s1}'])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[1][?(@.a2 nin ['${s1}', 3.21])]`);
+    test:assertEquals(result, <json[]>[stringJson]);
+
+    result = check read(j4, `$.a2[2][?(@.a1 in [1.12, ${b1}])]`);
+    test:assertEquals(result, <json[]>[booleanJson]);
+
+    result = check read(j4, `$.a2[2][?(@.a2 in [12.25, ${b1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[2][?(@.a1 nin [3.21, ${b1}])]`);
+    test:assertEquals(result, <json[]>[]);
+
+    result = check read(j4, `$.a2[2][?(@.a2 nin [${b1}, 3.21])]`);
+    test:assertEquals(result, <json[]>[booleanJson]);
 }
 
 @test:Config {}

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -6,7 +6,7 @@ authors = ["Ballerina"]
 keywords = ["json", "json path", "json-transform", "json transform", "json to json", "json-convert", "json convert"]
 repository = "https://github.com/ballerina-platform/module-ballerina-data.jsondata"
 license = ["Apache-2.0"]
-distribution = "2201.8.4"
+distribution = "2201.9.0-20240326-110600-aca0cc0c"
 export = ["data.jsondata"]
 
 [platform.java17]

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=0.1.0-SNAPSHOT
-ballerinaLangVersion=2201.8.4
+ballerinaLangVersion=2201.9.0-20240326-110600-aca0cc0c
 
 checkstyleToolVersion=10.12.0
 puppycrawlCheckstyleVersion=10.12.0

diff --git a/native/src/main/java/io/ballerina/lib/data/jsonpath/BJsonProvider.java b/native/src/main/java/io/ballerina/lib/data/jsonpath/BJsonProvider.java
@@ -215,7 +215,6 @@ public Object unwrap(Object obj) {
         } else if (isArray(obj)) {
             targetType = PredefinedTypes.TYPE_JSON_ARRAY;
         } else if (obj instanceof BString) {
-            obj = StringUtils.getStringValue(obj);
             targetType = PredefinedTypes.TYPE_STRING;
         } else if (obj instanceof BDecimal) {
             targetType = PredefinedTypes.TYPE_FLOAT;
@@ -235,7 +234,13 @@ public Object unwrap(Object obj) {
         } else {
             targetType = PredefinedTypes.TYPE_ANY;
         }
-        return JsonUtils.convertJSON(obj, targetType);
+        Object jsonValue = JsonUtils.convertJSON(obj, targetType);
+        if (jsonValue instanceof BString) {
+            return StringUtils.getStringValue(jsonValue);
+        } else if (jsonValue instanceof BDecimal) {
+            return ((BDecimal) jsonValue).decimalValue();
+        }
+        return jsonValue;
     }
 
     private boolean isJsonPrimitive(Object obj) {