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

Jump to bottom

Fix the invalid error for readonly record types #45

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fix the invalid error for readonly record types #45

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e98ad1
[Automated] Update the native jar versions
SasinduDilshara Oct 11, 2024
a9b93cc
[Automated] Update the native jar versions
SasinduDilshara Oct 11, 2024
de25263
Fix the invalid error for readonly record types
SasinduDilshara Oct 11, 2024
b8c1596
Merge branch 'main' into fix_7253
gimantha Oct 11, 2024
b540cf8
Added tests for readonly record fields
SasinduDilshara Oct 11, 2024
2dbd84d
Merge branch 'main' of https://github.com/ballerina-platform/module-b…
SasinduDilshara Oct 11, 2024
8fe12eb
Merge branch 'fix_7253' of https://github.com/SasinduDilshara/module-…
SasinduDilshara Oct 11, 2024
900ac32
Add tests for immutable types
SasinduDilshara Oct 11, 2024
3dce590
Add tests for readonly fields
SasinduDilshara Oct 11, 2024
9019906
Update the codeowner file
SasinduDilshara Oct 11, 2024
28c9eb6
Add tests for selectively immutable types
SasinduDilshara Oct 21, 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
11 changes: 11 additions & 0 deletions ballerina/tests/from_json_string_test.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@ isolated function testSimpleJsonStringToRecord() returns Error? {
test:assertEquals(recC.get("b"), 1);
}

type ReadOnlyUser readonly & record {|
SasinduDilshara marked this conversation as resolved.
Show resolved Hide resolved
int id;
|};

@test:Config
isolated function testSimpleJsonStringToRecord2() returns Error? {
string user = string `{"id": 4012}`;
ReadOnlyUser r = check parseString(user);
test:assertEquals(r, {id: 4012});
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add more tests with

  • members of selectively-immutable types that become immutable because the type it is in is immutable - e.g., like the id field, but with a selectively-immutable type
  • field of a readonly intersection type in a mutable type

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added tests for these scenarios.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please point to the relevant tests for each of these cases?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

testSimpleJsonToRecord6 , testSimpleJsonStringToRecord6 test functions
testSimpleJsonToRecord3, testSimpleJsonStringToRecord3 test functions

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • field of a readonly intersection type in a mutable type

Still can't find tests like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

type ReadOnlyUsersRecord3 readonly & record {|
    ReadonlyUserId[] ids;
    ReadonlyUserName[] names;
|};

@test:Config
isolated function testSimpleJsonToRecord6() returns Error? {
    json user = {ids: [4012, 4013], names: [{firstname: "John", lastname: "Doe"},
                                            {firstname: "Jane", lastname: "Doe"}], age: 27};
    ReadOnlyUsersRecord3 r = check parseAsType(user);
    test:assertEquals(r, {ids: [4012, 4013], names: [{firstname: "John", lastname: "Doe"},
                                                    {firstname: "Jane", lastname: "Doe"}]});
}

In here ReadonlyUserName is a readobly type of a record type

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I meant was something like

type T1 record {
   T2[] & readonly v;
};

@test:Config
isolated function testSimpleJsonStringToRecordWithProjection() returns Error? {
string str = string `{"a": "hello", "b": 1}`;
Expand Down
11 changes: 11 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 @@ -67,6 +67,17 @@ isolated function testSimpleJsonToRecord() returns Error? {
test:assertEquals(recC.get("b"), 1);
}

type ReadOnlyUserRecord readonly & record {|
int id;
|};

@test:Config
isolated function testSimpleJsonToRecord2() returns Error? {
json user = {id: 4012};
ReadOnlyUserRecord r = check parseAsType(user);
test:assertEquals(r, {id: 4012});
}

@test:Config
isolated function testSimpleJsonToRecordWithProjection() returns Error? {
json j = {"a": "hello", "b": 1};
Expand Down
2 changes: 1 addition & 1 deletion native/src/main/java/io/ballerina/lib/data/jsondata/json/JsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public Object execute(Reader reader, BMap<BString, Object> options, Type type) t
}
case TypeTags.INTERSECTION_TAG -> {
Type effectiveType = ((IntersectionType) type).getEffectiveType();
if (!SymbolFlags.isFlagOn(SymbolFlags.READONLY, effectiveType.getFlags())) {
SasinduDilshara marked this conversation as resolved.
Show resolved Hide resolved
if (!effectiveType.isReadOnly()) {
throw DiagnosticLog.error(DiagnosticErrorCode.UNSUPPORTED_TYPE, type);
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -158,7 +158,7 @@ private Object traverseJson(Object json, Type type) {
}
case TypeTags.INTERSECTION_TAG -> {
Type effectiveType = ((IntersectionType) referredType).getEffectiveType();
if (!SymbolFlags.isFlagOn(SymbolFlags.READONLY, effectiveType.getFlags())) {
if (!effectiveType.isReadOnly()) {
throw DiagnosticLog.error(DiagnosticErrorCode.UNSUPPORTED_TYPE, type);
}
for (Type constituentType : ((IntersectionType) referredType).getConstituentTypes()) {
Expand Down
Loading