From c9939a2754f22aa747e51d45398aa51a3211e86f Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Wed, 12 Aug 2020 11:31:03 +0300 Subject: [PATCH] [REQ][Java] Additional annotations with String params (#7117) * Additional annotations with String params * Additional annotations with String params. Missed sample update * Additional annotations with String params. Use Jackson annotations * insert unescaped content * fix imports * fix imports --- bin/configs/spring-mvc.yaml | 1 + .../resources/Java/additionalModelTypeAnnotations.mustache | 2 +- .../JavaInflector/additionalModelTypeAnnotations.mustache | 2 +- .../JavaJaxRS/additionalModelTypeAnnotations.mustache | 2 +- .../JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache | 2 +- .../JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache | 2 +- .../JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache | 2 +- .../resteasy/additionalModelTypeAnnotations.mustache | 2 +- .../resteasy/eap/additionalModelTypeAnnotations.mustache | 2 +- .../JavaJaxRS/spec/additionalModelTypeAnnotations.mustache | 2 +- .../JavaPlayFramework/additionalModelTypeAnnotations.mustache | 2 +- .../JavaSpring/additionalModelTypeAnnotations.mustache | 2 +- .../JavaVertXServer/additionalModelTypeAnnotations.mustache | 2 +- .../additionalModelTypeAnnotations.mustache | 2 +- .../resources/apex/additionalModelTypeAnnotations.mustache | 2 +- .../java-msf4j-server/additionalModelTypeAnnotations.mustache | 2 +- .../java-pkmst/additionalModelTypeAnnotations.mustache | 2 +- .../additionalModelTypeAnnotations.mustache | 2 +- .../org/openapitools/model/AdditionalPropertiesAnyType.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesArray.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesBoolean.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesClass.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesInteger.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesNumber.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesObject.java | 4 +++- .../org/openapitools/model/AdditionalPropertiesString.java | 4 +++- .../src/main/java/org/openapitools/model/Animal.java | 2 ++ .../java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java | 4 +++- .../main/java/org/openapitools/model/ArrayOfNumberOnly.java | 4 +++- .../src/main/java/org/openapitools/model/ArrayTest.java | 4 +++- .../src/main/java/org/openapitools/model/BigCat.java | 4 +++- .../src/main/java/org/openapitools/model/BigCatAllOf.java | 4 +++- .../src/main/java/org/openapitools/model/Capitalization.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/Cat.java | 4 +++- .../src/main/java/org/openapitools/model/CatAllOf.java | 4 +++- .../src/main/java/org/openapitools/model/Category.java | 4 +++- .../src/main/java/org/openapitools/model/ClassModel.java | 4 +++- .../src/main/java/org/openapitools/model/Client.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/Dog.java | 4 +++- .../src/main/java/org/openapitools/model/DogAllOf.java | 4 +++- .../src/main/java/org/openapitools/model/EnumArrays.java | 4 +++- .../src/main/java/org/openapitools/model/EnumTest.java | 4 +++- .../main/java/org/openapitools/model/FileSchemaTestClass.java | 4 +++- .../src/main/java/org/openapitools/model/FormatTest.java | 4 +++- .../src/main/java/org/openapitools/model/HasOnlyReadOnly.java | 4 +++- .../src/main/java/org/openapitools/model/MapTest.java | 4 +++- .../model/MixedPropertiesAndAdditionalPropertiesClass.java | 4 +++- .../main/java/org/openapitools/model/Model200Response.java | 4 +++- .../main/java/org/openapitools/model/ModelApiResponse.java | 4 +++- .../src/main/java/org/openapitools/model/ModelReturn.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/Name.java | 4 +++- .../src/main/java/org/openapitools/model/NumberOnly.java | 4 +++- .../src/main/java/org/openapitools/model/Order.java | 4 +++- .../src/main/java/org/openapitools/model/OuterComposite.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/Pet.java | 4 +++- .../src/main/java/org/openapitools/model/ReadOnlyFirst.java | 4 +++- .../main/java/org/openapitools/model/SpecialModelName.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/Tag.java | 4 +++- .../main/java/org/openapitools/model/TypeHolderDefault.java | 4 +++- .../main/java/org/openapitools/model/TypeHolderExample.java | 4 +++- .../spring-mvc/src/main/java/org/openapitools/model/User.java | 4 +++- .../src/main/java/org/openapitools/model/XmlItem.java | 4 +++- 62 files changed, 149 insertions(+), 60 deletions(-) diff --git a/bin/configs/spring-mvc.yaml b/bin/configs/spring-mvc.yaml index 11b49a4ecbd..2e8c1c718de 100644 --- a/bin/configs/spring-mvc.yaml +++ b/bin/configs/spring-mvc.yaml @@ -9,3 +9,4 @@ additionalProperties: artifactId: spring-mvc-server hideGenerationTimestamp: "true" serverPort: "8002" + additionalModelTypeAnnotations: '@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name");@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")' diff --git a/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache index e5dc1ac1295..f4871c02cc2 100644 --- a/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache +++ b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache @@ -1,2 +1,2 @@ -{{#additionalModelTypeAnnotations}}{{.}} +{{#additionalModelTypeAnnotations}}{{{.}}} {{/additionalModelTypeAnnotations}} \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 817c5dbee9e..32231ac15b3 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesAnyType */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesAnyType extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index e617dc74d1c..3df7383c4e9 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesArray */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesArray extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index cd910636ca6..657a707f31a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesBoolean */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesBoolean extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index accbd514dca..eb9314ffe6a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -16,7 +16,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesClass */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 8faf67a5b65..7b017dcbfca 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesInteger */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesInteger extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0d0076dda3f..5300974cf1b 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesNumber */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesNumber extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6b8f52be750..15052c7e36a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesObject */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesObject extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 5f308494e9b..0ac869d784c 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * AdditionalPropertiesString */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class AdditionalPropertiesString extends HashMap { @JsonProperty("name") private String name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java index 983aaa65168..19a83e4c92a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java @@ -21,6 +21,8 @@ import javax.validation.constraints.*; @JsonSubTypes.Type(value = Cat.class, name = "Cat"), @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"), }) +@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") public class Animal { @JsonProperty("className") diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e6562d84104..29034bd41ea 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * ArrayOfArrayOfNumberOnly */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 3df8310ee9e..12b5b2b05a8 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * ArrayOfNumberOnly */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java index 11afea41c01..95107a9472e 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * ArrayTest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ArrayTest { @JsonProperty("array_of_string") @Valid diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java index 68b76cd4885..f2517d65de5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * BigCat */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class BigCat extends Cat { /** * Gets or Sets kind diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java index 3198b91b6d4..648a7650557 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; /** * BigCatAllOf */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class BigCatAllOf { /** * Gets or Sets kind diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java index 3f226a3826a..776f0421b5a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * Capitalization */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Capitalization { @JsonProperty("smallCamel") private String smallCamel; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java index 5a431e966bb..e04909b60a4 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * Cat */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Cat extends Animal { @JsonProperty("declawed") private Boolean declawed; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java index 2853ec34afd..5e94e637889 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * CatAllOf */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class CatAllOf { @JsonProperty("declawed") private Boolean declawed; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java index a60e65b76f5..11077caeb50 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * Category */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Category { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java index c953d09e40e..ae9389e6e86 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; * Model for testing model with \"_class\" property */ @ApiModel(description = "Model for testing model with \"_class\" property") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ClassModel { @JsonProperty("_class") private String propertyClass; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java index 9d54590ff88..29163702738 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * Client */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Client { @JsonProperty("client") private String client; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java index 5f7e3c788a4..11c48130b34 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * Dog */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Dog extends Animal { @JsonProperty("breed") private String breed; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java index 1ef6c5e1bb7..80cc8d68607 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * DogAllOf */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class DogAllOf { @JsonProperty("breed") private String breed; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java index a0018a9a7fa..6e6d88b8be4 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * EnumArrays */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class EnumArrays { /** * Gets or Sets justSymbol diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java index 36de994dfa0..2402035cd6e 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * EnumTest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class EnumTest { /** * Gets or Sets enumString diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 56b56a169c6..a680b7ac5f0 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * FileSchemaTestClass */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class FileSchemaTestClass { @JsonProperty("file") private java.io.File file; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java index d7f34e095ac..b857da5c821 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java @@ -17,7 +17,9 @@ import javax.validation.constraints.*; /** * FormatTest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class FormatTest { @JsonProperty("integer") private Integer integer; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 9739eccbd61..52c71a17d85 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * HasOnlyReadOnly */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class HasOnlyReadOnly { @JsonProperty("bar") private String bar; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java index 7ba96a617a7..3544be99ca9 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java @@ -16,7 +16,9 @@ import javax.validation.constraints.*; /** * MapTest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class MapTest { @JsonProperty("map_map_of_string") @Valid diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index ef568c52b0c..00ded590988 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -18,7 +18,9 @@ import javax.validation.constraints.*; /** * MixedPropertiesAndAdditionalPropertiesClass */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("uuid") private UUID uuid; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java index 227f9d14bb2..daee27bc8d5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; * Model for testing model name starting with number */ @ApiModel(description = "Model for testing model name starting with number") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Model200Response { @JsonProperty("name") private Integer name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java index 9952d79cde1..61bf17b9e66 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * ModelApiResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ModelApiResponse { @JsonProperty("code") private Integer code; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java index c8de97c9e06..6126785f0d5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; * Model for testing reserved words */ @ApiModel(description = "Model for testing reserved words") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ModelReturn { @JsonProperty("return") private Integer _return; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java index 75097d13c16..662901518b0 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; * Model for testing model name same as property name */ @ApiModel(description = "Model for testing model name same as property name") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Name { @JsonProperty("name") private Integer name; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java index 4e7050b7076..df4e647a5fc 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; /** * NumberOnly */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class NumberOnly { @JsonProperty("JustNumber") private BigDecimal justNumber; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java index 15ac8f5bdda..de05fb7ab71 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java @@ -14,7 +14,9 @@ import javax.validation.constraints.*; /** * Order */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Order { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java index 260288087a3..55ce0216f79 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java @@ -13,7 +13,9 @@ import javax.validation.constraints.*; /** * OuterComposite */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class OuterComposite { @JsonProperty("my_number") private BigDecimal myNumber; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java index d53d8489823..1acb8e27456 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java @@ -19,7 +19,9 @@ import javax.validation.constraints.*; /** * Pet */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Pet { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 199ed97783f..f6997027652 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * ReadOnlyFirst */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class ReadOnlyFirst { @JsonProperty("bar") private String bar; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java index 5285c2d9ced..24e296c2387 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * SpecialModelName */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class SpecialModelName { @JsonProperty("$special[property.name]") private Long $specialPropertyName; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java index caef83520fc..4f832ecf43f 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * Tag */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class Tag { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java index c5a00c2c8f8..333228fe5d5 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * TypeHolderDefault */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class TypeHolderDefault { @JsonProperty("string_item") private String stringItem = "what"; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java index d7073c73a2f..233cda0d25b 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * TypeHolderExample */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class TypeHolderExample { @JsonProperty("string_item") private String stringItem; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java index 6512ac67354..5f842e936ef 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java @@ -12,7 +12,9 @@ import javax.validation.constraints.*; /** * User */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class User { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java index b179e232e4c..5dd1fa1f004 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java @@ -15,7 +15,9 @@ import javax.validation.constraints.*; /** * XmlItem */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name") +@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id") + public class XmlItem { @JsonProperty("attribute_string") private String attributeString;