diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache index a75bab002b..f97b1adb96 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache @@ -19,6 +19,9 @@ {{#micronaut_serde_jackson}} @Serdeable {{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/oneof_interface.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/oneof_interface.mustache index 0bb750f727..2ae923c3f4 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/oneof_interface.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/oneof_interface.mustache @@ -5,6 +5,12 @@ {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} +{{#micronaut_serde_jackson}} +@Serdeable +{{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{>common/model/typeInfoAnnotation}} {{>common/model/xmlAnnotation}} public {{>common/model/sealed}}interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{>common/model/permits}} { diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache index 50f8aa4616..72f00994a9 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache @@ -41,9 +41,6 @@ @Data {{/requiredPropertiesInConstructor}} {{/lombok}} -{{#micronaut_serde_jackson}} -@Serdeable -{{/micronaut_serde_jackson}} {{#jackson}} {{#vendorExtensions.hasOwnVars}} {{#vendorExtensions.withMultipleVars}} @@ -61,16 +58,17 @@ {{#additionalModelTypeAnnotations}} {{{.}}} {{/additionalModelTypeAnnotations}} +{{#micronaut_serde_jackson}} +@Serdeable +{{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} {{>common/model/typeInfoAnnotation}} {{>common/model/xmlAnnotation}} -{{#useBeanValidation}} - {{^micronaut_serde_jackson}} -@Introspected - {{/micronaut_serde_jackson}} -{{/useBeanValidation}} {{#vendorExtensions.x-class-extra-annotation}} {{{.}}} {{/vendorExtensions.x-class-extra-annotation}} diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache index 708de3575f..f90f9f5795 100644 --- a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache +++ b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache @@ -17,6 +17,9 @@ {{#micronaut_serde_jackson}} @Serdeable {{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache index a83701c3da..23e0995191 100644 --- a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache +++ b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache @@ -5,6 +5,12 @@ {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} +{{#micronaut_serde_jackson}} +@Serdeable +{{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{>common/model/typeInfoAnnotation}} {{/formatNoEmptyLines}}interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} : {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{#discriminator}} { diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache index 51ed322967..0e6c94c6f7 100644 --- a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache +++ b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache @@ -15,9 +15,6 @@ @Schema({{#vendorExtensions.realName}}name = "{{{vendorExtensions.realName}}}", {{/vendorExtensions.realName}}description = "{{{description}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}) {{/generateSwagger2Annotations}} {{/description}} -{{#micronaut_serde_jackson}} -@Serdeable -{{/micronaut_serde_jackson}} {{#jackson}} {{#vendorExtensions.hasOwnVars}} @JsonPropertyOrder( @@ -30,16 +27,17 @@ {{#additionalModelTypeAnnotations}} {{{.}}} {{/additionalModelTypeAnnotations}} +{{#micronaut_serde_jackson}} +@Serdeable +{{/micronaut_serde_jackson}} +{{^micronaut_serde_jackson}} +@Introspected +{{/micronaut_serde_jackson}} {{#generatedAnnotation}} {{>common/generatedAnnotation}} {{/generatedAnnotation}} {{>common/model/typeInfoAnnotation}} {{>common/model/xmlAnnotation}} -{{#useBeanValidation}} - {{^micronaut_serde_jackson}} -@Introspected - {{/micronaut_serde_jackson}} -{{/useBeanValidation}} {{#vendorExtensions.x-class-extra-annotation}} {{{.}}} {{/vendorExtensions.x-class-extra-annotation}}