From 99aa68a52dd178caa71f622dcdb5435667bbb4e3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 10 Oct 2021 18:06:34 +0200 Subject: [PATCH 1/5] fix: #1466 additionalProperties works now in spring generator --- .../codegen/languages/SpringCodegen.java | 2 + .../JavaSpring/additionalProperties.mustache | 39 +++++++++++++ .../main/resources/JavaSpring/model.mustache | 6 ++ .../main/resources/JavaSpring/pojo.mustache | 11 ++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 57 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 58 +++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 57 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 57 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 57 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 57 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesAnyType.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesArray.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesBoolean.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesInteger.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesNumber.java | 56 ++++++++++++++++-- .../model/AdditionalPropertiesObject.java | 55 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 56 ++++++++++++++++-- 130 files changed, 6372 insertions(+), 731 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 297c458e3c23..dfc545c28150 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -560,6 +560,8 @@ public void processOpts() { additionalProperties.put("lambdaTrimWhitespace", new TrimWhitespaceLambda()); additionalProperties.put("lambdaSplitString", new SplitStringLambda()); + + supportsAdditionalPropertiesWithComposedSchema = true; } @Override diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache new file mode 100644 index 000000000000..1aea56d9c5f0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache @@ -0,0 +1,39 @@ +{{#additionalPropertiesType}} + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public {{classname}} putAdditionalProperty(String key, {{{.}}} value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public {{{.}}} getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } +{{/additionalPropertiesType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache index 05eb15e10545..dccb8c90c7c0 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache @@ -43,6 +43,12 @@ import java.util.*; {{#models}} {{#model}} +{{#additionalPropertiesType}} +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +{{/additionalPropertiesType}} {{#isEnum}} {{>enumOuterClass}} {{/isEnum}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index f9bc2ae722a0..c098f82b9119 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -123,7 +123,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{^parent}}{{#ha } {{/vars}} - +{{>additionalProperties}} @Override public boolean equals(Object o) { if (this == o) { @@ -134,7 +134,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{^parent}}{{#ha }{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o; return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && - {{/-last}}{{/vars}}{{#parent}} && + {{/-last}}{{/vars}}{{#additionalPropertiesType}} && + Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return true;{{/hasVars}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} @@ -145,7 +146,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{^parent}}{{#ha @Override public int hashCode() { - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} private static int hashCodeNullable(JsonNullable a) { @@ -161,7 +162,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{^parent}}{{#ha sb.append("class {{classname}} {\n"); {{#parent}}sb.append(" ").append(toIndentedString(super.toString())).append("\n");{{/parent}} {{#vars}}sb.append(" {{name}}: ").append(toIndentedString({{name}})).append("\n"); - {{/vars}}sb.append("}"); + {{/vars}}{{#additionalPropertiesType}} + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + {{/additionalPropertiesType}}sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 54acb5633367..aac654e1ce9a 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +<<<<<<< HEAD import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; @@ -15,11 +16,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -43,6 +53,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +101,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index af849ea35e73..9a938477a44d 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; +<<<<<<< HEAD import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,11 +16,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -44,6 +53,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +101,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index e494b1b2c600..a76da08a73d8 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +<<<<<<< HEAD import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; @@ -15,11 +16,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -43,6 +53,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +101,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 7e78c62f6e16..b381ad8035c5 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +<<<<<<< HEAD import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; @@ -15,11 +16,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -43,6 +53,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +101,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index d01dc2c8e740..a8e388ec0bd4 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +<<<<<<< HEAD import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; @@ -16,11 +17,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -44,6 +54,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +102,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ef6da01824ae..41240745ac0f 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,20 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -43,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 13174a324c55..5961bfae27a4 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +<<<<<<< HEAD import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; @@ -15,11 +16,20 @@ import java.util.*; +======= +import javax.validation.Valid; +import javax.validation.constraints.*; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -43,6 +53,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +101,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 6de38b1147e6..8af4700ee5a3 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 @@ -6,23 +6,28 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @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 { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -46,6 +51,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -57,20 +99,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 cacb0750801f..c15e0a28c97f 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 @@ -6,24 +6,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @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 { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -47,6 +52,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +100,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 84aa067c80d0..3f10bf185d26 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 @@ -6,23 +6,28 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @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 { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -46,6 +51,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -57,20 +99,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 acc58a56a368..84b27e3a722a 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 @@ -6,23 +6,28 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @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 { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -46,6 +51,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -57,20 +99,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 be84ad677c57..3b1a8d27b032 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 @@ -7,23 +7,28 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @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 { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -47,6 +52,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +100,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 c9e823070d8e..3623da0fd7d4 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 @@ -6,23 +6,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @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 { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -46,6 +52,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -57,20 +100,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } 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 c62dc11f2ed2..09f5bd228bba 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 @@ -6,23 +6,28 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @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 { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -46,6 +51,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -57,20 +99,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 66ec66896784..9bcf53d236c3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,19 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -42,6 +47,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -53,20 +95,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index aeb477e916f2..e94231a22cc4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 4631883198a5..33ccab818290 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,19 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -42,6 +47,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -53,20 +95,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 30654d0bec87..9db1ecf892e8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,19 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -42,6 +47,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -53,20 +95,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 1a2c2a018f13..430a91f04a80 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,19 +7,24 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4f14fb1747d0..5b0b64a3ee51 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,19 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -42,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -53,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3cbd66fa9308..2ea9cbecbaa2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,19 +6,24 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -42,6 +47,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -53,20 +95,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 46281c6456d3..397650ec0fb3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 474278b1b192..cbf33018815b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c670f89cdfc0..8d3b7dc5d019 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ef4af43bbd9..fed0eb991acc 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 95a742297272..76b452f2f32d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,20 +7,25 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9969c2fe7201..8a3f49717cc4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,20 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -43,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 757c0a536fd8..31bf89b49dc0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 46281c6456d3..397650ec0fb3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 474278b1b192..cbf33018815b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c670f89cdfc0..8d3b7dc5d019 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ef4af43bbd9..fed0eb991acc 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 95a742297272..76b452f2f32d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,20 +7,25 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9969c2fe7201..8a3f49717cc4 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,20 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -43,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 757c0a536fd8..31bf89b49dc0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,20 +6,25 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -43,6 +48,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +96,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 22fa90b899c0..50e9c067b043 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 83acca5c876f..071d26300719 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index 8d09220b9cbb..6372fb9ee945 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index cac69369d0ae..d169276a4a08 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index b58b9bc950c4..d40cedf4e8d0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index 67b8b985fedf..c482fc215b50 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index 51c6a3054665..19acce08198e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 847d9f37777c..8b081294e66a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 31b7fad0c945..f7895d9017af 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -6,22 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5c23bc8d768e..719666235a28 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 802674f78205..c7243b361675 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 787a4262026a..4ee165170708 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,21 +7,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 271b66cf6820..a6163b4e294d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -6,21 +6,27 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +50,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +98,22 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 08ba6bfe63ce..437107c6f322 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,21 +6,26 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; +<<<<<<< HEAD import java.util.*; +======= +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +>>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +49,43 @@ public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +97,22 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } From db8e336198073b5053d23f6f909c3852ab9747f7 Mon Sep 17 00:00:00 2001 From: benfonty Date: Sun, 7 Nov 2021 13:37:09 +0100 Subject: [PATCH 2/5] chore: chore: #1466 solved rebase conflicts --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 8 -------- .../org/openapitools/model/AdditionalPropertiesArray.java | 7 ------- .../openapitools/model/AdditionalPropertiesBoolean.java | 8 -------- .../openapitools/model/AdditionalPropertiesInteger.java | 8 -------- .../openapitools/model/AdditionalPropertiesNumber.java | 8 -------- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 8 -------- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- .../virtualan/model/AdditionalPropertiesAnyType.java | 3 --- .../virtualan/model/AdditionalPropertiesArray.java | 3 --- .../virtualan/model/AdditionalPropertiesBoolean.java | 3 --- .../virtualan/model/AdditionalPropertiesInteger.java | 3 --- .../virtualan/model/AdditionalPropertiesNumber.java | 3 --- .../virtualan/model/AdditionalPropertiesObject.java | 3 --- .../virtualan/model/AdditionalPropertiesString.java | 3 --- .../openapitools/model/AdditionalPropertiesAnyType.java | 3 --- .../org/openapitools/model/AdditionalPropertiesArray.java | 3 --- .../openapitools/model/AdditionalPropertiesBoolean.java | 3 --- .../openapitools/model/AdditionalPropertiesInteger.java | 3 --- .../openapitools/model/AdditionalPropertiesNumber.java | 3 --- .../openapitools/model/AdditionalPropertiesObject.java | 3 --- .../openapitools/model/AdditionalPropertiesString.java | 3 --- 126 files changed, 407 deletions(-) diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index aac654e1ce9a..57318f5999a2 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -<<<<<<< HEAD -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,15 +13,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 9a938477a44d..78aaf9dfb99e 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.List; -<<<<<<< HEAD -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,15 +14,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index a76da08a73d8..27652a57838b 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -<<<<<<< HEAD -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,15 +13,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index b381ad8035c5..dd01fb59bcbb 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -<<<<<<< HEAD -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,15 +13,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index a8e388ec0bd4..176ac13a88a1 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -<<<<<<< HEAD -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -17,15 +14,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 41240745ac0f..a28f4d86f7a5 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 5961bfae27a4..4b4cea09fe0c 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -<<<<<<< HEAD -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,15 +13,10 @@ import java.util.*; -======= -import javax.validation.Valid; -import javax.validation.constraints.*; - import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ 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 8af4700ee5a3..8a2fd1421e50 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 @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ 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 c15e0a28c97f..cda98a8a6bd3 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 @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ 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 3f10bf185d26..1459370bcaff 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 @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ 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 84b27e3a722a..b07e8a75b477 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 @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ 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 3b1a8d27b032..74efc5b5d2e9 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 @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ 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 3623da0fd7d4..daddb4380bb7 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 @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ 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 09f5bd228bba..77ddcb3cbd30 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 @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 9bcf53d236c3..6b443207dca5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -9,16 +9,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index e94231a22cc4..15a6e50dc26d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 33ccab818290..becbb8c4de54 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -9,16 +9,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 9db1ecf892e8..2928b597e10f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -9,16 +9,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 430a91f04a80..07f86b25bea1 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b0b64a3ee51..7d43f0fed2cf 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2ea9cbecbaa2..09028239db50 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -9,16 +9,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 397650ec0fb3..d4db520771f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index cbf33018815b..760d9fcc72b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 8d3b7dc5d019..883d0328cf56 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index fed0eb991acc..2e361f327279 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 76b452f2f32d..03ffbf83e8ee 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 8a3f49717cc4..f41537ba2801 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 31bf89b49dc0..be36a8dd3725 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 397650ec0fb3..d4db520771f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index cbf33018815b..760d9fcc72b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 8d3b7dc5d019..883d0328cf56 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index fed0eb991acc..2e361f327279 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 76b452f2f32d..03ffbf83e8ee 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 8a3f49717cc4..f41537ba2801 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 31bf89b49dc0..be36a8dd3725 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -10,16 +10,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 50e9c067b043..ddbda8c21914 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 071d26300719..49fd371bb4f1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index 6372fb9ee945..6a529b70956f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index d169276a4a08..77b946ecc252 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index d40cedf4e8d0..c83f602d25c3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index c482fc215b50..f4359623ab2a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index 19acce08198e..c9dd0974adf1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b081294e66a..8809f34aa0e0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesAnyType */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f7895d9017af..9291658c38c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesArray */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 719666235a28..b15cb708d762 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesBoolean */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c7243b361675..4a5ff4172c4a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesInteger */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 4ee165170708..aaa498cfbe96 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesNumber */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index a6163b4e294d..b8b17cc91f19 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -12,16 +12,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesObject */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 437107c6f322..86c5f582533a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -11,16 +11,13 @@ import javax.validation.Valid; import javax.validation.constraints.*; -<<<<<<< HEAD import java.util.*; -======= import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; ->>>>>>> be1ba96d0a1... fix: #1466 additionalProperties works now in spring generator /** * AdditionalPropertiesString */ From 0d1c564858760de73e0a1dd25f2532c62be76407 Mon Sep 17 00:00:00 2001 From: James Wynn Date: Fri, 25 Mar 2022 15:01:50 -0500 Subject: [PATCH 3/5] 1466; updated samples --- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- .../model/AdditionalPropertiesAnyType.java | 5 +- .../model/AdditionalPropertiesArray.java | 5 +- .../model/AdditionalPropertiesBoolean.java | 5 +- .../model/AdditionalPropertiesInteger.java | 5 +- .../model/AdditionalPropertiesNumber.java | 5 +- .../model/AdditionalPropertiesObject.java | 5 +- .../model/AdditionalPropertiesString.java | 5 +- 140 files changed, 2128 insertions(+), 540 deletions(-) diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e9f7fa501c06 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..634ae0748c9c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..16c26c2902d3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..eea065ad03d0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..10cf4e766dfb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..1b25ce255bc5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..c892a59676c5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e01b3214db27..63747eafbbdd 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -15,12 +13,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ec428cb349f4..8f9f4b869b43 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 90527250a4d5..adabcb4f6895 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -15,12 +13,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index e71c315dbade..63bd36ca6449 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -15,12 +13,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 089260568478..ae38214da31c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index d7852c1184a2..cf334b4e916b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -15,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -43,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 78fd51e521fc..bea907543f0c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -15,12 +13,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e9f7fa501c06 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..634ae0748c9c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..16c26c2902d3 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..eea065ad03d0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..10cf4e766dfb 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..1b25ce255bc5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..c892a59676c5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e9f7fa501c06 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..634ae0748c9c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..16c26c2902d3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..eea065ad03d0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..10cf4e766dfb 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..1b25ce255bc5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..c892a59676c5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e9f7fa501c06 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..634ae0748c9c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..16c26c2902d3 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..eea065ad03d0 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..10cf4e766dfb 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..1b25ce255bc5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..c892a59676c5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e9f7fa501c06 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..634ae0748c9c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..16c26c2902d3 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..eea065ad03d0 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..10cf4e766dfb 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumber */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { +public class AdditionalPropertiesNumber { @JsonProperty("name") private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..1b25ce255bc5 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { @JsonProperty("name") private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..c892a59676c5 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { @JsonProperty("name") private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 53992465bd12..e9f7fa501c06 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index f541df1d58ab..634ae0748c9c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 8d73fe2de3d5..16c26c2902d3 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 0170db2497ef..eea065ad03d0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 76538bb3e8eb..10cf4e766dfb 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 61571c226c97..1b25ce255bc5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b8e3dfc93593..c892a59676c5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 98e82d506def..6234e67001fa 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index e4795f986f91..008bb52d9cf4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da8407417111..f66b7f29a447 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index a9d5df8d33cd..5c3f6d2e7bcc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index c6b37f2ae2a6..16f8f5f5f5b4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6f8aae62cdd5..134c9e42747c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3a4e26b27330..39e81441fec2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -45,7 +46,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -106,7 +106,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 14f3b4006b2f..f9ae8c3ed7d3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 3e17127944a8..9fd3c4bd9f80 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index 485b79f21941..ac3908eac8bc 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index e2dd7614cfef..98a0ce45a464 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index 4d22c3a49783..f3fe05ac3d0f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index 8fe579ac559f..7996001d98ca 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index 714de17b9ae7..826452e7a388 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index ab379927489b..03001c56c0df 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType { +public class AdditionalPropertiesAnyType { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 115e81b11b9d..439835c11ed7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray { +public class AdditionalPropertiesArray { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index f9cad43f17e4..351cf2ccef9b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean { +public class AdditionalPropertiesBoolean { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3452407c5ae..be833e73de61 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger { +public class AdditionalPropertiesInteger { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e38a1e94bd87..6849c87a3a7f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber { +public class AdditionalPropertiesNumber { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 4c1d9877e603..5746f29ab54c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -25,7 +25,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject { +public class AdditionalPropertiesObject { + @JsonProperty("name") private String name; @@ -47,7 +48,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -108,7 +108,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7a0f1b0f1d7c..f6f28febabab 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,8 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString { +public class AdditionalPropertiesString { + @JsonProperty("name") private String name; @@ -46,7 +47,6 @@ public String getName() { public void setName(String name) { this.name = name; } - /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -107,7 +107,6 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); From 664ce07225264eb6a32dc281fa280696ed08f2ce Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Wed, 7 Jun 2023 10:50:33 +0300 Subject: [PATCH 4/5] [Spring] update additionalProperties MR --- .../JavaSpring/additionalProperties.mustache | 20 +++---- .../main/resources/JavaSpring/pojo.mustache | 12 ++--- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyTypeDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArrayDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBooleanDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesIntegerDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumberDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObjectDto.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesStringDto.java | 52 ++++++++++++++++--- .../org/openapitools/model/BigCatDto.java | 2 +- .../java/org/openapitools/model/CatDto.java | 2 +- .../java/org/openapitools/model/DogDto.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../main/java/org/openapitools/model/Bar.java | 2 +- .../org/openapitools/model/BarCreate.java | 2 +- .../java/org/openapitools/model/BarRef.java | 2 +- .../main/java/org/openapitools/model/Foo.java | 2 +- .../java/org/openapitools/model/FooRef.java | 2 +- .../java/org/openapitools/model/Pasta.java | 2 +- .../java/org/openapitools/model/Pizza.java | 2 +- .../org/openapitools/model/PizzaSpeziale.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 20 +++---- .../model/AdditionalPropertiesArray.java | 20 +++---- .../model/AdditionalPropertiesBoolean.java | 20 +++---- .../model/AdditionalPropertiesInteger.java | 20 +++---- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 20 +++---- .../model/AdditionalPropertiesString.java | 20 +++---- .../java/org/openapitools/model/BigCat.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArray.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBoolean.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesInteger.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumber.java | 20 +++---- .../model/AdditionalPropertiesObject.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesString.java | 52 ++++++++++++++++--- .../openapitools/virtualan/model/BigCat.java | 2 +- .../org/openapitools/virtualan/model/Cat.java | 2 +- .../org/openapitools/virtualan/model/Dog.java | 2 +- .../model/AdditionalPropertiesAnyTypeDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesArrayDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesBooleanDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesIntegerDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesNumberDto.java | 52 ++++++++++++++++--- .../model/AdditionalPropertiesObjectDto.java | 51 ++++++++++++++++-- .../model/AdditionalPropertiesStringDto.java | 52 ++++++++++++++++--- .../org/openapitools/model/BigCatDto.java | 2 +- .../java/org/openapitools/model/CatDto.java | 2 +- .../java/org/openapitools/model/DogDto.java | 2 +- 196 files changed, 2125 insertions(+), 1326 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache index 1aea56d9c5f0..649734535dff 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/additionalProperties.mustache @@ -12,11 +12,11 @@ */ @JsonAnySetter public {{classname}} putAdditionalProperty(String key, {{{.}}} value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -24,16 +24,16 @@ */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public {{{.}}} getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } {{/additionalPropertiesType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 1825666526f3..5ad92093b18a 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -194,6 +194,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} } {{! end feature: getter and setter }} {{/vars}} +{{>additionalProperties}} {{#parentVars}} {{! begin feature: fluent setter methods for inherited properties }} @@ -217,8 +218,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/isMap}} {{! end feature: fluent setter methods for inherited properties }} {{/parentVars}} - - {{>additionalProperties}} @Override public boolean equals(Object o) { if (this == o) { @@ -233,13 +232,11 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} return true;{{/hasVars}} - } - {{#vendorExtensions.x-jackson-optional-nullable-helpers}} + }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} private static boolean equalsNullable(JsonNullable a, JsonNullable b) { return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); - } - {{/vendorExtensions.x-jackson-optional-nullable-helpers}} + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public int hashCode() { @@ -251,8 +248,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} return 1; } return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; - } - {{/vendorExtensions.x-jackson-optional-nullable-helpers}} + }{{/vendorExtensions.x-jackson-optional-nullable-helpers}} @Override public String toString() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0158358738f5..892bc45b54d8 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -56,11 +56,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -68,17 +68,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index bf4a4754d07d..b816ec47f614 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -57,11 +57,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -69,17 +69,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 8d298e51b487..3cd4d77d90e8 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -56,11 +56,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -68,17 +68,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index e7ad90186661..737e3cacc6fa 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -56,11 +56,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -68,17 +68,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 375464180c1f..d0dd13320352 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -57,11 +57,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -69,17 +69,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 0aa14d7d5510..02e3c24144c7 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -57,11 +57,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -69,17 +69,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 8dbdcf3ee297..017623f29662 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -56,11 +56,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -68,17 +68,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java index 76aaaa09e325..3541b302f0ba 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -96,6 +96,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -110,7 +111,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java index d3bf47431051..bfc8ca1e9594 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java @@ -64,6 +64,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -73,7 +74,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java index 13b6bed90e9a..af740a2b0791 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java @@ -56,6 +56,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -65,7 +66,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 966547c80da2..1f622d81d6f8 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -15,13 +13,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyTypeDto */ @JsonTypeName("AdditionalPropertiesAnyType") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyTypeDto extends HashMap { +public class AdditionalPropertiesAnyTypeDto { private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyTypeDto putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyTypeDto additionalPropertiesAnyType = (AdditionalPropertiesAnyTypeDto) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyTypeDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 41bf9effe534..8de22a106ec5 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -5,9 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -16,13 +14,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArrayDto */ @JsonTypeName("AdditionalPropertiesArray") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArrayDto extends HashMap { +public class AdditionalPropertiesArrayDto { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArrayDto putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArrayDto additionalPropertiesArray = (AdditionalPropertiesArrayDto) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArrayDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index 8335c2ba832f..ccbeb217afed 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -15,13 +13,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBooleanDto */ @JsonTypeName("AdditionalPropertiesBoolean") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBooleanDto extends HashMap { +public class AdditionalPropertiesBooleanDto { private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBooleanDto putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBooleanDto additionalPropertiesBoolean = (AdditionalPropertiesBooleanDto) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBooleanDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index a7b0f41e8645..31228ec343fa 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -15,13 +13,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesIntegerDto */ @JsonTypeName("AdditionalPropertiesInteger") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesIntegerDto extends HashMap { +public class AdditionalPropertiesIntegerDto { private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesIntegerDto putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesIntegerDto additionalPropertiesInteger = (AdditionalPropertiesIntegerDto) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesIntegerDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 955cd7c3aac7..d5aefff70565 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -16,13 +14,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumberDto */ @JsonTypeName("AdditionalPropertiesNumber") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumberDto extends HashMap { +public class AdditionalPropertiesNumberDto { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumberDto putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumberDto additionalPropertiesNumber = (AdditionalPropertiesNumberDto) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumberDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index eac3c186356c..ba505f614557 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -15,13 +14,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObjectDto */ @JsonTypeName("AdditionalPropertiesObject") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObjectDto extends HashMap { +public class AdditionalPropertiesObjectDto { private String name; @@ -43,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObjectDto putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObjectDto additionalPropertiesObject = (AdditionalPropertiesObjectDto) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObjectDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index fd8f19f618ee..1e03903a96ed 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -15,13 +13,17 @@ import java.util.*; import jakarta.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesStringDto */ @JsonTypeName("AdditionalPropertiesString") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesStringDto extends HashMap { +public class AdditionalPropertiesStringDto { private String name; @@ -43,6 +45,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesStringDto putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -54,20 +93,21 @@ public boolean equals(Object o) { } AdditionalPropertiesStringDto additionalPropertiesString = (AdditionalPropertiesStringDto) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesStringDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index b30873ccfde9..7371fe8f42a7 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -87,6 +87,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCatDto declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -101,7 +102,6 @@ public BigCatDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index b1866e10bcc3..9ced3946e233 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -54,6 +54,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public CatDto className(String className) { super.setClassName(className); return this; @@ -63,7 +64,6 @@ public CatDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java index 878670e18122..13c6d10ca444 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java @@ -47,6 +47,7 @@ public void setBreed(String breed) { this.breed = breed; } + public DogDto className(String className) { super.setClassName(className); return this; @@ -56,7 +57,6 @@ public DogDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 08a0e40b3ab6..b428083157a5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 5bc349612ea8..1ef99f92381d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 3771b759cbd9..39c436b6783c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 07ae63c65ed8..bbe132e5bf05 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index a695d385da2e..e6d82a1670fa 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6cdc2d2ba38b..ad91c5ef3f9e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b0941310dba2..257889991720 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index 1185161d530f..7137b0d1f61b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -88,6 +88,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -102,7 +103,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index 19aef83bf5d5..75c7a38f8946 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -56,6 +56,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -65,7 +66,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java index 9c16eaab5985..adee0c4e06d3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java @@ -48,6 +48,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -57,7 +58,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index b6b8e8d3715a..8f07a579c228 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -127,6 +127,7 @@ public void setFoo(FooRefOrValue foo) { this.foo = foo; } + public Bar href(String href) { super.setHref(href); return this; @@ -146,7 +147,6 @@ public Bar atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index e6a5c1708614..47b469527e83 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -106,6 +106,7 @@ public void setFoo(FooRefOrValue foo) { this.foo = foo; } + public BarCreate href(String href) { super.setHref(href); return this; @@ -130,7 +131,6 @@ public BarCreate atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java index d9e107b0bdac..f98ddb830d63 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java @@ -37,6 +37,7 @@ public BarRef(String atType) { super(atType); } + public BarRef name(String name) { super.setName(name); return this; @@ -71,7 +72,6 @@ public BarRef atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index 9814e3e49a33..b5c893ecca37 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -81,6 +81,7 @@ public void setFooPropB(String fooPropB) { this.fooPropB = fooPropB; } + public Foo href(String href) { super.setHref(href); return this; @@ -105,7 +106,6 @@ public Foo atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index 4eea905e7585..9e09ce9d9ca8 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -59,6 +59,7 @@ public void setFoorefPropA(String foorefPropA) { this.foorefPropA = foorefPropA; } + public FooRef name(String name) { super.setName(name); return this; @@ -93,7 +94,6 @@ public FooRef atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index 6e9867564395..7ea027d1697c 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -59,6 +59,7 @@ public void setVendor(String vendor) { this.vendor = vendor; } + public Pasta href(String href) { super.setHref(href); return this; @@ -83,7 +84,6 @@ public Pasta atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index 3e299a0531bf..3aeee042b73b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -68,6 +68,7 @@ public void setPizzaSize(BigDecimal pizzaSize) { this.pizzaSize = pizzaSize; } + public Pizza href(String href) { super.setHref(href); return this; @@ -92,7 +93,6 @@ public Pizza atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index d2eab0f238b8..6b749b2931f1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -60,6 +60,7 @@ public void setToppings(String toppings) { this.toppings = toppings; } + public PizzaSpeziale pizzaSize(BigDecimal pizzaSize) { super.setPizzaSize(pizzaSize); return this; @@ -89,7 +90,6 @@ public PizzaSpeziale atType(String atType) { super.setAtType(atType); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 08a0e40b3ab6..b428083157a5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 5bc349612ea8..1ef99f92381d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 3771b759cbd9..39c436b6783c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 07ae63c65ed8..bbe132e5bf05 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index a695d385da2e..e6d82a1670fa 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6cdc2d2ba38b..ad91c5ef3f9e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b0941310dba2..257889991720 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 9c8a6d6e33be..d7d4a583cdc6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -99,6 +99,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -113,7 +114,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index fecd9f133638..549a191c9018 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -67,6 +67,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -76,7 +77,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 2571ae3227b9..eec8089fac5a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -59,6 +59,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -68,7 +69,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 08a0e40b3ab6..b428083157a5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 5bc349612ea8..1ef99f92381d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 3771b759cbd9..39c436b6783c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 07ae63c65ed8..bbe132e5bf05 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index a695d385da2e..e6d82a1670fa 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6cdc2d2ba38b..ad91c5ef3f9e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b0941310dba2..257889991720 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 9c8a6d6e33be..d7d4a583cdc6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -99,6 +99,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -113,7 +114,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index fecd9f133638..549a191c9018 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -67,6 +67,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -76,7 +77,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 2571ae3227b9..eec8089fac5a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -59,6 +59,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -68,7 +69,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 08a0e40b3ab6..b428083157a5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 5bc349612ea8..1ef99f92381d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 3771b759cbd9..39c436b6783c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 07ae63c65ed8..bbe132e5bf05 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index a695d385da2e..e6d82a1670fa 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 6cdc2d2ba38b..ad91c5ef3f9e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b0941310dba2..257889991720 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java index 9c8a6d6e33be..d7d4a583cdc6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java @@ -99,6 +99,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -113,7 +114,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java index fecd9f133638..549a191c9018 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java @@ -67,6 +67,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -76,7 +77,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java index 2571ae3227b9..eec8089fac5a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java @@ -59,6 +59,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -68,7 +69,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e37e13d13b7c..a5b36c8b84c9 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 62db05370243..0bd7a3eb2b3a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index d545cd724c43..b3fe3270d5f3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 0c3927c0c2fb..081515a30f9d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 99df792888ee..fbf4e9401bdc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 7d93494bae10..92f1175dd7e7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c9b9ef82733e..4ecdc3e498da 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -59,11 +59,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -71,17 +71,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 568b75b8866f..48178c23991d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -99,6 +99,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -113,7 +114,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index 275e776a4c64..e56583bfd837 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -67,6 +67,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -76,7 +77,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index 8604922059ae..1228d7608374 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -59,6 +59,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -68,7 +69,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java index 554d4d83db6b..737832d86a4c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -60,6 +60,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java index 554d4d83db6b..737832d86a4c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java @@ -60,6 +60,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java index 554d4d83db6b..737832d86a4c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -60,6 +60,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java index 554d4d83db6b..737832d86a4c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java @@ -60,6 +60,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0a3315dad5d7..bd218422f919 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object valu */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a05e7c9cb87c..548dad9a0401 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public List getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 92b87546ac28..7eff631b3864 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Boolean getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5ac61a2a1243..53a7354098c5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer val */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Integer getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 5e84228aae1d..d9c197156a88 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e94799a280e9..a0b695f115ad 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -61,11 +61,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -73,17 +73,17 @@ public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public Map getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3739bc57ef3d..2ef5cd4f06bd 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesString putAdditionalProperty(String key, String value */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public String getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index c761fa72ce72..6e5c18407d13 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -100,6 +100,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -114,7 +115,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 854a4bce13f5..28c512c9dae1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -68,6 +68,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -77,7 +78,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index b85cb9e358ee..266ff6ac060d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -60,6 +60,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -69,7 +70,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 206db52a72f8..c0b0054308f5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyType */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { +public class AdditionalPropertiesAnyType { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 1ccea4df28cf..b374c6d2fa36 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -4,9 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -17,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArray */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { +public class AdditionalPropertiesArray { private String name; @@ -45,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -56,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index 2343eb8798eb..5db0d2787fa0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBoolean */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { +public class AdditionalPropertiesBoolean { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index 4913c13bad43..228c2642944b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesInteger */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { +public class AdditionalPropertiesInteger { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index 2d58f34f93ab..eaeb988a8545 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -60,11 +60,11 @@ public void setName(String name) { */ @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; } /** @@ -72,17 +72,17 @@ public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal v */ @JsonAnyGetter public Map getAdditionalProperties() { - return additionalProperties; + return additionalProperties; } /** * Return the additional (undeclared) property with the specified name. */ public BigDecimal getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); } @Override diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index fab88cc6ac04..26a074a6bade 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -4,7 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -16,12 +15,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObject */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { +public class AdditionalPropertiesObject { private String name; @@ -44,6 +47,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +95,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index 592acfa0695d..d5308d8e2286 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -4,8 +4,6 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -16,12 +14,16 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesString */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { +public class AdditionalPropertiesString { private String name; @@ -44,6 +46,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -55,20 +94,21 @@ public boolean equals(Object o) { } AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index 6d5969009315..f698279d6001 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -99,6 +99,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCat declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -113,7 +114,6 @@ public BigCat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index 77ec9c3d05e3..f2ab039b4f73 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -67,6 +67,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public Cat className(String className) { super.setClassName(className); return this; @@ -76,7 +77,6 @@ public Cat color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java index 8338080cdc9b..ae7199a102cf 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java @@ -59,6 +59,7 @@ public void setBreed(String breed) { this.breed = breed; } + public Dog className(String className) { super.setClassName(className); return this; @@ -68,7 +69,6 @@ public Dog color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index a6ba7205ba72..319982ca35d8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -18,13 +16,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesAnyTypeDto */ @JsonTypeName("AdditionalPropertiesAnyType") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyTypeDto extends HashMap { +public class AdditionalPropertiesAnyTypeDto { private String name; @@ -47,6 +49,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyTypeDto putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +97,21 @@ public boolean equals(Object o) { } AdditionalPropertiesAnyTypeDto additionalPropertiesAnyType = (AdditionalPropertiesAnyTypeDto) o; return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesAnyTypeDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 2d3046d21528..666f01b55912 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -7,9 +7,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -19,13 +17,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesArrayDto */ @JsonTypeName("AdditionalPropertiesArray") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArrayDto extends HashMap { +public class AdditionalPropertiesArrayDto { private String name; @@ -48,6 +50,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArrayDto putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -59,20 +98,21 @@ public boolean equals(Object o) { } AdditionalPropertiesArrayDto additionalPropertiesArray = (AdditionalPropertiesArrayDto) o; return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesArrayDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index 48df16e5b138..37c80cd6f5dd 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -18,13 +16,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesBooleanDto */ @JsonTypeName("AdditionalPropertiesBoolean") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBooleanDto extends HashMap { +public class AdditionalPropertiesBooleanDto { private String name; @@ -47,6 +49,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBooleanDto putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +97,21 @@ public boolean equals(Object o) { } AdditionalPropertiesBooleanDto additionalPropertiesBoolean = (AdditionalPropertiesBooleanDto) o; return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesBooleanDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 9a2882492713..1293dd90cba2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -18,13 +16,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesIntegerDto */ @JsonTypeName("AdditionalPropertiesInteger") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesIntegerDto extends HashMap { +public class AdditionalPropertiesIntegerDto { private String name; @@ -47,6 +49,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesIntegerDto putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +97,21 @@ public boolean equals(Object o) { } AdditionalPropertiesIntegerDto additionalPropertiesInteger = (AdditionalPropertiesIntegerDto) o; return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesIntegerDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 9623f9828ee9..36e88b07b091 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -19,13 +17,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesNumberDto */ @JsonTypeName("AdditionalPropertiesNumber") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumberDto extends HashMap { +public class AdditionalPropertiesNumberDto { private String name; @@ -48,6 +50,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumberDto putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -59,20 +98,21 @@ public boolean equals(Object o) { } AdditionalPropertiesNumberDto additionalPropertiesNumber = (AdditionalPropertiesNumberDto) o; return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesNumberDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 513a01771060..360fe963d8dd 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -18,13 +17,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesObjectDto */ @JsonTypeName("AdditionalPropertiesObject") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObjectDto extends HashMap { +public class AdditionalPropertiesObjectDto { private String name; @@ -47,6 +50,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObjectDto putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +98,21 @@ public boolean equals(Object o) { } AdditionalPropertiesObjectDto additionalPropertiesObject = (AdditionalPropertiesObjectDto) o; return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesObjectDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 239aa573c7af..40862348de9a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.HashMap; -import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -18,13 +16,17 @@ import java.util.*; import javax.annotation.Generated; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; /** * AdditionalPropertiesStringDto */ @JsonTypeName("AdditionalPropertiesString") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesStringDto extends HashMap { +public class AdditionalPropertiesStringDto { private String name; @@ -47,6 +49,43 @@ public String getName() { public void setName(String name) { this.name = name; } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesStringDto putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } @Override public boolean equals(Object o) { @@ -58,20 +97,21 @@ public boolean equals(Object o) { } AdditionalPropertiesStringDto additionalPropertiesString = (AdditionalPropertiesStringDto) o; return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); } @Override public int hashCode() { - return Objects.hash(name, super.hashCode()); + return Objects.hash(name, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdditionalPropertiesStringDto {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index ebf2f7c7a5f6..ce526bd14365 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -102,6 +102,7 @@ public void setKind(KindEnum kind) { this.kind = kind; } + public BigCatDto declawed(Boolean declawed) { super.setDeclawed(declawed); return this; @@ -116,7 +117,6 @@ public BigCatDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java index 2606c731e048..373d7dbbf838 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java @@ -69,6 +69,7 @@ public void setDeclawed(Boolean declawed) { this.declawed = declawed; } + public CatDto className(String className) { super.setClassName(className); return this; @@ -78,7 +79,6 @@ public CatDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java index 122f68845882..3b879dfa1dea 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java @@ -62,6 +62,7 @@ public void setBreed(String breed) { this.breed = breed; } + public DogDto className(String className) { super.setClassName(className); return this; @@ -71,7 +72,6 @@ public DogDto color(String color) { super.setColor(color); return this; } - @Override public boolean equals(Object o) { if (this == o) { From cfbc4c0b2cff84d0479ef3e298580ffe3f06e90c Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Thu, 8 Jun 2023 15:46:58 +0300 Subject: [PATCH 5/5] [Spring] additionalProperties unit test --- .../java/spring/SpringCodegenTest.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2274a74b258b..5900a4a7e35c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -605,6 +605,34 @@ public void testMultipartBoot() throws IOException { .containsWithNameAndAttributes("RequestPart", ImmutableMap.of("value", "\"statusArray\"", "required", "false")); } + @Test + public void testAdditionalProperties_issue1466() throws IOException { + final SpringCodegen codegen = new SpringCodegen(); + + final Map files = generateFiles(codegen, "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesAnyType.java")) + .hasProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Object") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Object"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesArray.java")) + .hasProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "List") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("List"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesInteger.java")) + .hasProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Integer") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); + } + @Test public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue_issue14418() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile();