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][generichost] Remove discriminator property #18445

Merged
merged 10 commits into from
May 21, 2024

Conversation

devhl-labs
Copy link
Contributor

Please merge this first #18408
closes #17397

Removes the discriminator because new Whale("whale") is redundant. We can just do new Whale()

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/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    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*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@devhl-labs devhl-labs marked this pull request as draft April 28, 2024 22:43
@gerwinjansen
Copy link

Nice improvement, thanks!
Just a new minor comments:

  • in the generated code the discriminator constant is now spread across 2 classes. For instance, the constant "BasquePig" exists in Pig.Read() and BasquePig.Write(). Not a big deal because you don't have to maintain generated code.
  • BasquePig.Read() also reads the discriminator, which is kind of duplicate on what Pig.Read() also does. Could be a (minor) performance improvement to skip it.

@devhl-labs devhl-labs marked this pull request as ready for review May 19, 2024 18:15
@devhl-labs
Copy link
Contributor Author

Kept the discriminator property so de/serialization can still work with libraries other than STJ. Hard coded the value of the discriminator property so we can remove it from the constructor. Reworked the manual tests to compare json instead of classes to be more concise. Also added more manual tests to ensure de/serialization works. I think this is ready to go @wing328

* @param model
* @param property
* @return
*/
private boolean codegenPropertyIsNew(CodegenModel model, CodegenProperty property) {
Copy link
Member

@wing328 wing328 May 21, 2024

Choose a reason for hiding this comment

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

maybe we should rename it to something like codegenPropertyIsNewOrDiscriminator but that's pretty minor.

fyi, later i may refactor this function into codegen model/property class instead to avoid too many function in default codegen class

@wing328 wing328 merged commit ede6458 into OpenAPITools:master May 21, 2024
26 checks passed
@wing328 wing328 added this to the 7.7.0 milestone May 21, 2024
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.

None yet

3 participants