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

[Java][bugfix] hashcode/equals behave incorrectly when inheritance is used in Generated Pojos #15745

Merged

Conversation

pyckle
Copy link
Contributor

@pyckle pyckle commented Jun 4, 2023

This PR improves the equals and hashCode methods in Java code when inheritance is used. This was previously partially done, but for a much smaller subset of the generators, and was buggy.

  • hashCode/equals is now identical for all of JAX-RS codegen, and also in a few other java codegen targets
  • Correctly handles cases where child class has no properties. This is a real use case, because the discriminator in the parent class may be unique
  • Doesn't change generated code for most codegen targets
  • Unit test added to ensure that super.hashCode() and super.equals() are called when appropriate

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.
  • In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date
    
    Commit all changed files.
  • File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.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.
    @bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608

@pyckle pyckle changed the title Improve hashcode equals when inheritance is used in Generated Java Pojos [Java] Improve hashcode equals when inheritance is used in Generated Pojos Jun 4, 2023
@pyckle pyckle changed the title [Java] Improve hashcode equals when inheritance is used in Generated Pojos [Java][bugfix] hashcode/equals behave incorrectly when inheritance is used in Generated Pojos Jun 5, 2023
@wing328
Copy link
Member

wing328 commented Jun 15, 2023

@pyckle can you please resolve the merge conflicts when you've time?

@pyckle pyckle force-pushed the java_improve_hashcode_equals_inheritance branch from d1778cf to fbab8d5 Compare June 15, 2023 22:01
@pyckle
Copy link
Contributor Author

pyckle commented Jun 15, 2023

@wing328 - done (:

@wing328 wing328 merged commit 33aa5b0 into OpenAPITools:master Jun 21, 2023
fmoraespadtec pushed a commit to padteclab/openapi-generator that referenced this pull request Jun 26, 2023
… used in Generated Pojos (OpenAPITools#15745)

* Fix Java equals and hashCode methods to work with inheritence (OpenAPITools#5756)

* Regenerate code samples with improved hashCode/equals

---------

Co-authored-by: Andrew Pikler <[email protected]>
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