-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix deserialization of polymorphic types when discriminator property …
…is unknown or null (#981) Fix deserialization of polymorphic types when discriminator property is unknown or null (#980) * Cleanup remaining custom polymorphic MixIns * Add defaultImpl to @JsonTypeInfo annotation - Handles cases where the discriminator is null, like Directory Integration apps Co-authored-by: Clément Denis <[email protected]>
- Loading branch information
1 parent
0c75262
commit 5713c56
Showing
3 changed files
with
18 additions
and
122 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
api/src/main/resources/custom_templates/typeInfoAnnotation.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{{! | ||
Based on https://github.com/OpenAPITools/openapi-generator/blob/v6.6.0/modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache | ||
- Add defaultImpl to deserialize to base type if discriminator is null or unknown | ||
- Remove @JsonIgnoreProperties on discriminator field and set include to JsonTypeInfo.As.EXISTING_PROPERTY | ||
}} | ||
{{#jackson}} | ||
|
||
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true, defaultImpl = {{classname}}.class) | ||
{{#discriminator.mappedModels}} | ||
{{#-first}} | ||
@JsonSubTypes({ | ||
{{/-first}} | ||
@JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"), | ||
{{#-last}} | ||
}) | ||
{{/-last}} | ||
{{/discriminator.mappedModels}} | ||
{{/jackson}} |
50 changes: 0 additions & 50 deletions
50
impl/src/main/java/com/okta/sdk/impl/deserializer/PolymorphicMixIns.java
This file was deleted.
Oops, something went wrong.
72 changes: 0 additions & 72 deletions
72
impl/src/test/groovy/com/okta/sdk/impl/deserializer/PolymorphicMixInsTest.groovy
This file was deleted.
Oops, something went wrong.