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][Spring] fix one of #10286

Closed
wants to merge 37 commits into from
Closed

[Java][Spring] fix one of #10286

wants to merge 37 commits into from

Conversation

Orachigami
Copy link

@Orachigami Orachigami commented Aug 30, 2021

Fixes: #2906
Fixes: #5381
Fixes: #8647
Fixes: #8860
Fixes: #9601
Fixes: #9981

Added tests oneOfModelsGeneration for Java Spring and Java Client which iterate through several specs with OneOf usage cases and check that OneOf models are generated and subtypes implement generated models. Java Client test also creates a cartesian product of specs and client libraries for regress tests.

How inline OneOf models generation is fixed

Added x-deduction and x-deduction-model-names for vendorExtensions. These extensions are used to generated Jackson annotation when the discriminator cannot be used. The discriminator uses the specific field value for deserialization decisions. However, according to the https://swagger.io/specification#discriminator-object first example, oneOf can be used without the discriminator object. This case can be handled with Jackson recently added JsonTypeInfo.Id.DEDUCTION option. DEDUCTION option forces Jackson to make deserialization decisions according to the available fields in the payload and Models which implement oneOf interface/class.

ToDo

  • Polymorphic primitives deserialization

Example output screenshots

Output examples
Specification usage OneOf code Model code

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.

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @nmuesch (2021/01)

alexsuperdev and others added 28 commits March 22, 2020 11:15
added x-is-one-of-interface extension for oneOf interface in mustache
template
fixed name of model from UNKNOWN_BASE_TYPE to right one in api: operationId + OneOf

Fix #5381
parcelableModel is not required
removed not needed methods
catch NPE cases in preprocessOpenAPI
updated samples
fixed generation of oneOf Models
addOneOfInterfaceModel only for cases when useOneOfInterfaces is true and for spring
NPE fix
…rator into spring_fix_5381

� Conflicts:
�	modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
spring: fixed use of oneOf Models in API
implementing oneOf for spring lib overriding methods with different behavior from default
added x-is-one-of-interface extension for oneOf interface in mustache
template
fixed name of model from UNKNOWN_BASE_TYPE to right one in api: operationId + OneOf

Fix #5381
removed not needed methods

Fix #5381
fixed generation of oneOf Models

Fix #5381
addOneOfInterfaceModel only for cases when useOneOfInterfaces is true and for spring

Fix #5381
NPE fix for tests
fixed handing of composed schema with array
fixed NPE in addOneOfInterfaceModel
fixed generation of oneOf models with descriminator
# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
# Conflicts:
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@Orachigami Orachigami changed the title TAP-232 OneOf fixes [Java][Spring] fix one of Aug 30, 2021
@Orachigami Orachigami mentioned this pull request Sep 22, 2021
5 tasks
@Orachigami
Copy link
Author

Moved to #10463 as @Wing suggested

@Orachigami Orachigami closed this Sep 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment