Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid compile time errors when expected type is map and data projection is false #49

Merged
merged 9 commits into from
Nov 13, 2024
Merged

Fix invalid compile time errors when expected type is map and data projection is false #49

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
61e791c
Fix issues with map types when data projection is false
SasinduDilshara Nov 4, 2024
3e80cae
Added test for nlable types with map as expected types
SasinduDilshara Nov 4, 2024
ce1b864
Merge branch 'main' of https://github.com/ballerina-platform/module-b…
SasinduDilshara Nov 4, 2024
907da11
Update testMapAsExpectedTypeWithJsonSource test function
SasinduDilshara Nov 5, 2024
aa624d1
Add union tests for parseAsType function with data projection false
SasinduDilshara Nov 12, 2024
4a15be9
Merge branch 'main' into issue_7329
gimantha Nov 12, 2024
8e98e64
update testMapAsExpectedTypeWithJsonSource tests with aseert type
SasinduDilshara Nov 13, 2024
e39f05b
Merge branch 'issue_7329' of https://github.com/SasinduDilshara/modul…
SasinduDilshara Nov 13, 2024
21e654a
Merge branch 'main' of https://github.com/ballerina-platform/module-b…
SasinduDilshara Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions ballerina/tests/from_json_test.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,3 +1752,43 @@ function testReadonlyFieldsWithNameAnnotation() returns error? {
ReadonlyFieldsRec27 r7 = check parseAsType(user);
test:assertEquals(r7, {testId: 4012, testTaxNo: "N/A", testName: "John Doe"});
}

@test:Config
function testMapAsExpectedTypeWithJsonSource() returns error? {
json jsonValue = {id: "chamil", values: {a: 2, b: 45, c: {x: "mnb", y: "uio"}}};
json jsonValue2 = {id: 1, age: 23};
json jsonValue3 = {name: "abc", address: "N/A"};

map<json> mapValue = check parseAsType(jsonValue, options = {allowDataProjection: false});
test:assertEquals(mapValue, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

record{|json...;|} recValue = check parseAsType(jsonValue, options = {allowDataProjection: false});
test:assertEquals(recValue, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

map<json> mapValue2 = check parseAsType(jsonValue, options = {allowDataProjection: {}});
SasinduDilshara marked this conversation as resolved.
Show resolved Hide resolved
test:assertEquals(mapValue2, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

record{|json...;|} recValue2 = check parseAsType(jsonValue, options = {allowDataProjection: {}});
test:assertEquals(recValue2, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

map<anydata> mapValue3 = check parseAsType(jsonValue, options = {allowDataProjection: {}});
test:assertEquals(mapValue3, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

map<json>? mapValue4 = check parseAsType(jsonValue, options = {allowDataProjection: false});
test:assertEquals(mapValue4, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

record{|json?...;|} recValue3 = check parseAsType(jsonValue, options = {allowDataProjection: false});
test:assertEquals(recValue3, {"id": "chamil", "values": {"a":2, "b": 45, "c": {"x": "mnb", "y": "uio"}}});

map<int> mapValue5 = check parseAsType(jsonValue2, options = {allowDataProjection: false});
test:assertEquals(mapValue5, {id: 1, age: 23});

map<string> mapValue6 = check parseAsType(jsonValue3, options = {allowDataProjection: false});
test:assertEquals(mapValue6, {name: "abc", address: "N/A"});

record{|int...;|} recValue4 = check parseAsType(jsonValue2, options = {allowDataProjection: false});
test:assertEquals(recValue4, {id: 1, age: 23});

record{|string...;|} recValue5 = check parseAsType(jsonValue3, options = {allowDataProjection: false});
SasinduDilshara marked this conversation as resolved.
Show resolved Hide resolved
test:assertEquals(recValue5, {name: "abc", address: "N/A"});
SasinduDilshara marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions native/src/main/java/io/ballerina/lib/data/jsondata/json/JsonTraverse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ private Object traverseMapValue(BMap<BString, Object> map, Object currentJsonNod
if (restType.peek() != null) {
Type restFieldType = TypeUtils.getReferredType(restType.peek());
addRestField(restFieldType, key, map.get(key), currentJsonNode);
continue;
}
if (allowDataProjection) {
continue;
Expand Down
Loading