loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-05 15:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Kotlin-Spring] Fix required model property deserialization (#8337)

Browse Source 
* Fix required model property deserialization

* Update samples
This commit is contained in:
Christophe Bornet 2021-01-07 09:18:21 +01:00 committed by GitHub
parent 4526ca2610
commit e73ae8c048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache vendored
View File

@ -1,5 +1,4 @@
{{#useBeanValidation}}{{#required}}{{^isReadOnly}} {{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}}
@get:NotNull{{/isReadOnly}}{{/required}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}{{#deprecated}}
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}{{#deprecated}}
@Deprecated(message = ""){{/deprecated}} @Deprecated(message = ""){{/deprecated}}
@field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} @field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}

7
modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache vendored
View File

@ -1,4 +1,3 @@
{{#useBeanValidation}}{{#required}}{{^isReadOnly}} {{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}}
@get:NotNull {{/isReadOnly}}{{/required}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}} @field:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}}
@field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}}

6
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt
View File

@ -26,13 +26,11 @@ import io.swagger.annotations.ApiModelProperty
*/ */
data class Pet( data class Pet(
@get:NotNull
@ApiModelProperty(example = "doggie", required = true, value = "") @ApiModelProperty(example = "doggie", required = true, value = "")
@field:JsonProperty("name") val name: kotlin.String, @field:JsonProperty("name", required = true) val name: kotlin.String,
@get:NotNull
@ApiModelProperty(example = "null", required = true, value = "") @ApiModelProperty(example = "null", required = true, value = "")
@field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>, @field:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List<kotlin.String>,
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
@field:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonProperty("id") val id: kotlin.Long? = null,

6
samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt
View File

@ -26,13 +26,11 @@ import io.swagger.annotations.ApiModelProperty
*/ */
data class Pet( data class Pet(
@get:NotNull
@ApiModelProperty(example = "doggie", required = true, value = "") @ApiModelProperty(example = "doggie", required = true, value = "")
@field:JsonProperty("name") val name: kotlin.String, @field:JsonProperty("name", required = true) val name: kotlin.String,
@get:NotNull
@ApiModelProperty(example = "null", required = true, value = "") @ApiModelProperty(example = "null", required = true, value = "")
@field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>, @field:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List<kotlin.String>,
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
@field:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonProperty("id") val id: kotlin.Long? = null,

6
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
View File

@ -26,13 +26,11 @@ import io.swagger.annotations.ApiModelProperty
*/ */
data class Pet( data class Pet(
@get:NotNull
@ApiModelProperty(example = "doggie", required = true, value = "") @ApiModelProperty(example = "doggie", required = true, value = "")
@field:JsonProperty("name") val name: kotlin.String, @field:JsonProperty("name", required = true) val name: kotlin.String,
@get:NotNull
@ApiModelProperty(example = "null", required = true, value = "") @ApiModelProperty(example = "null", required = true, value = "")
@field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>, @field:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List<kotlin.String>,
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
@field:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonProperty("id") val id: kotlin.Long? = null,