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.

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

[csharp-netcore] Upgrade to System.Text.Json #11741

Merged
merged 36 commits into from
Mar 10, 2022
Merged

Conversation

devhl-labs
Copy link
Contributor

@devhl-labs devhl-labs commented Feb 28, 2022

Upgrading the generic host json library to System.Text.Json. Tested with anyOf, allOf, and oneOf schemas located at
modules\openapi-generator\src\test\resources\3_0

anyOf

string appleJson = "{\"color\": \"red\", \"kind\": \"apple\"}";

Fruit? apple = System.Text.Json.JsonSerializer.Deserialize<Fruit>(appleJson, Org.OpenAPITools.Client.ClientUtils.JsonSerializerOptions);

allOf

string childJson = "{\"boosterSeat\": true, \"age\": 1, \"$_type\": \"Child\", \"lastName\": \"Smith\", \"firstName\": \"Abe\"}";

Child? child = System.Text.Json.JsonSerializer.Deserialize<Child>(childJson, Org.OpenAPITools.Client.ClientUtils.JsonSerializerOptions);

string adultJson = $"{{\"children\": [{childJson}], \"$_type\": \"Adult\", \"lastName\": \"Smith\", \"firstName\": \"Bob\"}}";

Adult? adult = System.Text.Json.JsonSerializer.Deserialize<Adult>(adultJson, Org.OpenAPITools.Client.ClientUtils.JsonSerializerOptions);

oneOf

string appleJson = "{\"color\": \"red\", \"kind\": \"apple\"}";

Fruit? apple = System.Text.Json.JsonSerializer.Deserialize<Fruit>(appleJson, Org.OpenAPITools.Client.ClientUtils.JsonSerializerOptions);

string bananaJson = "{\"color\": \"red\", \"count\": 1}";

Fruit? banana = System.Text.Json.JsonSerializer.Deserialize<Fruit>(bananaJson, Org.OpenAPITools.Client.ClientUtils.JsonSerializerOptions);

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)

@devhl-labs
Copy link
Contributor Author

devhl-labs commented Mar 10, 2022

I'd love to know how that commit means samples are not up to date. Something is broken there.

edit - oh, it's python....

Run if [[ "$(git status --porcelain)" != "" ]]; then
UNCOMMITTED CHANGES ERROR
There are uncommitted changes in working tree after execution of 'bin/generate-samples.sh'
Perform git diff
diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/foo_object.py b/samples/openapi3/client/petstore/python/petstore_api/model/foo_object.py

@wing328
Copy link
Member

wing328 commented Mar 10, 2022

That's fixed in the master. It happens when we merge an old PR into master in which some new tests have been added to the test spec.

@wing328 wing328 merged commit 22a1906 into OpenAPITools:master Mar 10, 2022
@wing328 wing328 added this to the 6.0.0 milestone Mar 10, 2022
@devhl-labs devhl-labs deleted the stj branch March 10, 2022 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants