Merge pull request #53 from HindujaB/java21

Migrate runtime APIs for Java 21

.github/CODEOWNERS

@@ -4,4 +4,4 @@
 # See: https://help.github.com/articles/about-codeowners/
 
 # These owners will be the default owners for everything in the repo.
-*       @gimantha @MaryamZi @hasithaa
+*       @gimantha @MaryamZi @hasithaa @SasinduDilshara

ballerina/Dependencies.toml

@@ -177,7 +177,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.4.0"
+version = "2.5.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}

ballerina/json_api.bal

@@ -55,18 +55,8 @@ public isolated function parseStream(stream<byte[], error?> s, Options options =
 #
 # + v - Source anydata value
 # + return - representation of `v` as value of type json
-public isolated function toJson(anydata v) returns json {
-    if v is anydata[] {
-        return from anydata elem in v
-            select toJson(elem);
-    } else if v is map<anydata> {
-        return map from var [key, feild] in v.entries()
-            select [getNameAnnotation(v, key), toJson(feild)];
-    }
-    return v.toJson();
-}
-
-isolated function getNameAnnotation(map<anydata> data, string key) returns string = @java:Method {'class: "io.ballerina.lib.data.jsondata.json.Native"} external;
+public isolated function toJson(anydata v) returns json =
+    @java:Method {'class: "io.ballerina.lib.data.jsondata.json.Native"} external;
 
 # Prettifies a `json` value to print it.
 #

ballerina/tests/from_json_string_test.bal

@@ -60,6 +60,61 @@ isolated function testSimpleJsonStringToRecord() returns Error? {
     test:assertEquals(recC.get("b"), 1);
 }
 
+@test:Config
+isolated function testSimpleJsonStringToRecord2() returns Error? {
+    string user = string `{"id": 4012}`;
+    ReadOnlyUserRecord r = check parseString(user);
+    test:assertEquals(r, {id: 4012});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord3() returns Error? {
+    string user = string `{"id": 4012, "name": {"firstname": "John", "lastname": "Doe"}, "age": 27}`;
+    ReadOnlyUserRecord2 r = check parseString(user);
+    test:assertEquals(r, {id: 4012, age: 27, name: {firstname: "John", lastname: "Doe"}});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord4() returns Error? {
+    string user = string `{"id": 4012, "name": {"firstname": "John", "lastname": "Doe"}, "age": 27}`;
+    UserRecord3 r = check parseString(user);
+    test:assertEquals(r, {id: 4012, age: 27, name: {firstname: "John", lastname: "Doe"}});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord5() returns Error? {
+    string user = string `{"id": 4012, "name": {"firstname": "John", "lastname": "Doe"}, "age": 27}`;
+    ReadOnlyUserRecord2 r = check parseString(user);
+    test:assertEquals(r, {id: 4012, age: 27, name: {firstname: "John", lastname: "Doe"}});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord6() returns Error? {
+    string user = string `{"ids": [4012, 4013], "names": [{"firstname": "John", "lastname": "Doe"},
+                                            {"firstname": "Jane", "lastname": "Doe"}], "age": 27}`;
+    ReadOnlyUsersRecord3 r = check parseString(user);
+    test:assertEquals(r, {ids: [4012, 4013], names: [{firstname: "John", lastname: "Doe"},
+                                                    {firstname: "Jane", lastname: "Doe"}]});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord7() returns Error? {
+    string user = string `{"ids": [4012, 4013], "names": [{"firstname": "John", "lastname": "Doe"},
+                                            {"firstname": "Jane", "lastname": "Doe"}], "age": 27}`;
+    ReadOnlyUsersRecord4 r = check parseString(user);
+    test:assertEquals(r, {ids: [4012, 4013], names: [{firstname: "John", lastname: "Doe"},
+                                                    {firstname: "Jane", lastname: "Doe"}]});
+}
+
+@test:Config
+isolated function testSimpleJsonStringToRecord8() returns Error? {
+    string user = string `{"ids": [4012, 4013], "names": [{"firstname": "John", "lastname": "Doe"},
+                                            {"firstname": "Jane", "lastname": "Doe"}], "age": 27}`;
+    ReadOnlyUsersRecord5 r = check parseString(user);
+    test:assertEquals(r, {ids: [4012, 4013], names: [{firstname: "John", lastname: "Doe"},
+                                                    {firstname: "Jane", lastname: "Doe"}]});
+}
+
 @test:Config
 isolated function testSimpleJsonStringToRecordWithProjection() returns Error? {
     string str = string `{"a": "hello", "b": 1}`;