Skip to content

Commit 1a78332

Browse files
altro3altro3
committed
Added Serdeable annotation to oneOf interface
Fixed #2377
1 parent 408983a commit 1a78332

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

‎openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
{{#micronaut_serde_jackson}}
2020
@Serdeable
2121
{{/micronaut_serde_jackson}}
22+
{{^micronaut_serde_jackson}}
23+
@Introspected
24+
{{/micronaut_serde_jackson}}
2225
{{#generatedAnnotation}}
2326
{{>common/generatedAnnotation}}
2427
{{/generatedAnnotation}}

‎openapi-generator/src/main/resources/templates/java-micronaut/common/model/oneof_interface.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
{{#generatedAnnotation}}
66
{{>common/generatedAnnotation}}
77
{{/generatedAnnotation}}
8+
{{#micronaut_serde_jackson}}
9+
@Serdeable
10+
{{/micronaut_serde_jackson}}
11+
{{^micronaut_serde_jackson}}
12+
@Introspected
13+
{{/micronaut_serde_jackson}}
814
{{>common/model/typeInfoAnnotation}}
915
{{>common/model/xmlAnnotation}}
1016
public {{>common/model/sealed}}interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{>common/model/permits}} {

‎openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
@Data
4242
{{/requiredPropertiesInConstructor}}
4343
{{/lombok}}
44-
{{#micronaut_serde_jackson}}
45-
@Serdeable
46-
{{/micronaut_serde_jackson}}
4744
{{#jackson}}
4845
{{#vendorExtensions.hasOwnVars}}
4946
{{#vendorExtensions.withMultipleVars}}
@@ -61,16 +58,17 @@
6158
{{#additionalModelTypeAnnotations}}
6259
{{{.}}}
6360
{{/additionalModelTypeAnnotations}}
61+
{{#micronaut_serde_jackson}}
62+
@Serdeable
63+
{{/micronaut_serde_jackson}}
64+
{{^micronaut_serde_jackson}}
65+
@Introspected
66+
{{/micronaut_serde_jackson}}
6467
{{#generatedAnnotation}}
6568
{{>common/generatedAnnotation}}
6669
{{/generatedAnnotation}}
6770
{{>common/model/typeInfoAnnotation}}
6871
{{>common/model/xmlAnnotation}}
69-
{{#useBeanValidation}}
70-
{{^micronaut_serde_jackson}}
71-
@Introspected
72-
{{/micronaut_serde_jackson}}
73-
{{/useBeanValidation}}
7472
{{#vendorExtensions.x-class-extra-annotation}}
7573
{{{.}}}
7674
{{/vendorExtensions.x-class-extra-annotation}}

‎openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
{{#micronaut_serde_jackson}}
1818
@Serdeable
1919
{{/micronaut_serde_jackson}}
20+
{{^micronaut_serde_jackson}}
21+
@Introspected
22+
{{/micronaut_serde_jackson}}
2023
{{#generatedAnnotation}}
2124
{{>common/generatedAnnotation}}
2225
{{/generatedAnnotation}}

‎openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
{{#generatedAnnotation}}
66
{{>common/generatedAnnotation}}
77
{{/generatedAnnotation}}
8+
{{#micronaut_serde_jackson}}
9+
@Serdeable
10+
{{/micronaut_serde_jackson}}
11+
{{^micronaut_serde_jackson}}
12+
@Introspected
13+
{{/micronaut_serde_jackson}}
814
{{>common/model/typeInfoAnnotation}}
915
{{/formatNoEmptyLines}}interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} : {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{#discriminator}} {
1016

‎openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
@Schema({{#vendorExtensions.realName}}name = "{{{vendorExtensions.realName}}}", {{/vendorExtensions.realName}}description = "{{{description}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}})
1616
{{/generateSwagger2Annotations}}
1717
{{/description}}
18-
{{#micronaut_serde_jackson}}
19-
@Serdeable
20-
{{/micronaut_serde_jackson}}
2118
{{#jackson}}
2219
{{#vendorExtensions.hasOwnVars}}
2320
@JsonPropertyOrder(
@@ -30,16 +27,17 @@
3027
{{#additionalModelTypeAnnotations}}
3128
{{{.}}}
3229
{{/additionalModelTypeAnnotations}}
30+
{{#micronaut_serde_jackson}}
31+
@Serdeable
32+
{{/micronaut_serde_jackson}}
33+
{{^micronaut_serde_jackson}}
34+
@Introspected
35+
{{/micronaut_serde_jackson}}
3336
{{#generatedAnnotation}}
3437
{{>common/generatedAnnotation}}
3538
{{/generatedAnnotation}}
3639
{{>common/model/typeInfoAnnotation}}
3740
{{>common/model/xmlAnnotation}}
38-
{{#useBeanValidation}}
39-
{{^micronaut_serde_jackson}}
40-
@Introspected
41-
{{/micronaut_serde_jackson}}
42-
{{/useBeanValidation}}
4341
{{#vendorExtensions.x-class-extra-annotation}}
4442
{{{.}}}
4543
{{/vendorExtensions.x-class-extra-annotation}}

‎openapi/src/test/groovy/io/micronaut/openapi/visitor/OpenApiPageSpec.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class MyBean {}
8585
sortOrderSchema.properties.ignoreCase
8686
sortOrderSchema.properties.direction
8787
sortOrderSchema.properties.property
88-
sortOrderSchema.properties.ascending
8988

9089
sortOrderDirectionSchema.enum[0] == 'ASC'
9190
sortOrderDirectionSchema.enum[1] == 'DESC'

0 commit comments

Comments
 (0)