Skip to content

Commit bc9f3ea

Browse files
committed
Revert "refactor: Add JsonInclude(JsonInclude.Include.NON_NULL)"
This reverts commit 539072a.
1 parent 02ee993 commit bc9f3ea

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

hivemq-edge-openapi/openapi/templates/Java/README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ The discriminator name `type` conflicts with the JackSon `type`. This patch chan
2020
@JsonIgnoreProperties(
2121
- value = "{{{discriminator.propertyBaseName}}}", // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
2222
- allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
23-
+ value = "json{{{discriminator.propertyBaseName}}}", // ignore manually set json{{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
24-
+ allowSetters = true // allows the json{{{discriminator.propertyBaseName}}} to be set during deserialization
23+
value = "json{{{discriminator.propertyBaseName}}}", // ignore manually set json{{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
24+
allowSetters = true // allows the json{{{discriminator.propertyBaseName}}} to be set during deserialization
2525
)
2626

2727
- @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
2828
+ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "json{{{discriminator.propertyBaseName}}}", visible = true)
29-
30-
{{#discriminator.mappedModels}}
31-
{{#-first}}
32-
+ @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
33-
@JsonSubTypes({
3429
```

hivemq-edge-openapi/openapi/templates/Java/typeInfoAnnotation.mustache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "json{{{discriminator.propertyBaseName}}}", visible = true)
99
{{#discriminator.mappedModels}}
1010
{{#-first}}
11-
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
1211
@JsonSubTypes({
1312
{{/-first}}
1413
@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}}"),
@@ -22,4 +21,4 @@
2221
{{/-first}}
2322
@JsonbSubtype(alias = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}", type = {{modelName}}.class),
2423
{{#-last}}
25-
}{{/-last}}{{/discriminator.mappedModels}}){{/jsonbPolymorphism}}
24+
}{{/-last}}{{/discriminator.mappedModels}}){{/jsonbPolymorphism}}

0 commit comments

Comments
 (0)