fix issue when discriminator property is an enum string (#13001)

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java

@@ -22,6 +22,7 @@ public class CodegenDiscriminator {
     private String propertyGetter;
     private String propertyType;
     private Map<String, String> mapping;
+    private boolean isEnum;
 
     // mappedModels is populated differently if legacyDiscriminatorBehavior is
     // True or False. When:
@@ -88,6 +89,14 @@ public class CodegenDiscriminator {
         this.mappedModels = mappedModels;
     }
 
+    public boolean getIsEnum() {
+        return isEnum;
+    }
+
+    public void setIsEnum(boolean isEnum) {
+        this.isEnum = isEnum;
+    }
+
     /**
      * An object to hold discriminator mappings between payload values and schema names or
      * references.

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -3313,8 +3313,19 @@ public class DefaultCodegen implements CodegenConfig {
         discriminator.setPropertyName(toVarName(discPropName));
         discriminator.setPropertyBaseName(sourceDiscriminator.getPropertyName());
         discriminator.setPropertyGetter(toGetter(discriminator.getPropertyName()));
+
         // FIXME: for now, we assume that the discriminator property is String
         discriminator.setPropertyType(typeMapping.get("string"));
+
+        // check to see if the discriminator property is an enum string
+        if (schema.getProperties() != null &&
+                schema.getProperties().get(discPropName) instanceof StringSchema) {
+            StringSchema s = (StringSchema) schema.getProperties().get(discPropName);
+            if (s.getEnum() != null && !s.getEnum().isEmpty()) { // it's an enum string
+                discriminator.setIsEnum(true);
+            }
+        }
+
         discriminator.setMapping(sourceDiscriminator.getMapping());
         List<MappedModel> uniqueDescendants = new ArrayList<>();
         if (sourceDiscriminator.getMapping() != null && !sourceDiscriminator.getMapping().isEmpty()) {

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache

@@ -105,10 +105,22 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
   {{/vars}}
-  public {{classname}}() { {{#parent}}{{#parcelableModel}}
-    super();{{/parcelableModel}}{{/parent}}{{#gson}}{{#discriminator}}
-    this.{{{discriminatorName}}} = this.getClass().getSimpleName();{{/discriminator}}{{/gson}}
-  }{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}
+  public {{classname}}() {
+    {{#parent}}
+    {{#parcelableModel}}
+    super();
+    {{/parcelableModel}}
+    {{/parent}}
+    {{#gson}}
+    {{#discriminator}}
+    {{^discriminator.isEnum}}
+    this.{{{discriminatorName}}} = this.getClass().getSimpleName();
+    {{/discriminator.isEnum}}
+    {{/discriminator}}
+    {{/gson}}
+  }
+  {{#vendorExtensions.x-has-readonly-properties}}
+  {{^withXml}}
 
   {{#jsonb}}@JsonbCreator{{/jsonb}}{{#jackson}}@JsonCreator{{/jackson}}
   public {{classname}}(
@@ -120,7 +132,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#readOnlyVars}}
     this.{{name}} = {{name}};
   {{/readOnlyVars}}
-  }{{/withXml}}{{/vendorExtensions.x-has-readonly-properties}}
+  }
+  {{/withXml}}
+  {{/vendorExtensions.x-has-readonly-properties}}
   {{#vars}}
 
   {{^isReadOnly}}

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -88,10 +88,21 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
   {{/vars}}
-  public {{classname}}() { {{#parent}}{{#parcelableModel}}
-    super();{{/parcelableModel}}{{/parent}}{{#gson}}{{#discriminator}}
-    this.{{{discriminatorName}}} = this.getClass().getSimpleName();{{/discriminator}}{{/gson}}
-  }{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}
+  public {{classname}}() {
+    {{#parent}}
+    {{#parcelableModel}}
+    super();{{/parcelableModel}}
+    {{/parent}}
+    {{#gson}}
+    {{#discriminator}}
+    {{#discriminator.isEnum}}
+    this.{{{discriminatorName}}} = this.getClass().getSimpleName();
+    {{/discriminator.isEnum}}
+    {{/discriminator}}
+    {{/gson}}
+  }
+  {{#vendorExtensions.x-has-readonly-properties}}
+  {{^withXml}}
 
   {{#jsonb}}@JsonbCreator{{/jsonb}}{{#jackson}}@JsonCreator{{/jackson}}
   public {{classname}}(
@@ -103,7 +114,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#readOnlyVars}}
     this.{{name}} = {{#vendorExtensions.x-is-jackson-optional-nullable}}{{name}} == null ? JsonNullable.<{{{datatypeWithEnum}}}>undefined() : JsonNullable.of({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{name}}{{/vendorExtensions.x-is-jackson-optional-nullable}};
   {{/readOnlyVars}}
-  }{{/withXml}}{{/vendorExtensions.x-has-readonly-properties}}
+  }
+  {{/withXml}}
+  {{/vendorExtensions.x-has-readonly-properties}}
   {{#vars}}
 
   {{^isReadOnly}}

modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml

@@ -2205,3 +2205,17 @@ components:
                 properties:
                   color:
                     type: string
+    EnumStringDiscriminator:
+      type: object
+      description: An object to test discriminator of enum string
+      discriminator:
+        propertyName: enum_str_type
+      required:
+        - enum_str_type
+      properties:
+        enum_str_type:
+          description: enum string type
+          type: string
+          enum:
+            - type_a
+            - type_b

samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java

@@ -114,7 +114,7 @@ public class SomeObj {
   @SerializedName(SERIALIZED_NAME_TYPE)
   private String type;
 
-  public SomeObj() { 
+  public SomeObj() {
   }
 
   public SomeObj $type(TypeEnum $type) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -38,7 +38,8 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesAnyType() { 
+  public AdditionalPropertiesAnyType() {
+
   }
 
   public AdditionalPropertiesAnyType name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesArray() { 
+  public AdditionalPropertiesArray() {
+
   }
 
   public AdditionalPropertiesArray name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -38,7 +38,8 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesBoolean() { 
+  public AdditionalPropertiesBoolean() {
+
   }
 
   public AdditionalPropertiesBoolean name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
   private Object anytype3;
 
-  public AdditionalPropertiesClass() { 
+  public AdditionalPropertiesClass() {
   }
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -38,7 +38,8 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesInteger() { 
+  public AdditionalPropertiesInteger() {
+
   }
 
   public AdditionalPropertiesInteger name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesNumber() { 
+  public AdditionalPropertiesNumber() {
+
   }
 
   public AdditionalPropertiesNumber name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -38,7 +38,8 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesObject() { 
+  public AdditionalPropertiesObject() {
+
   }
 
   public AdditionalPropertiesObject name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -38,7 +38,8 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesString() { 
+  public AdditionalPropertiesString() {
+
   }
 
   public AdditionalPropertiesString name(String name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java

@@ -57,7 +57,7 @@ public class Animal {
   public static final String JSON_PROPERTY_COLOR = "color";
   private String color = "red";
 
-  public Animal() { 
+  public Animal() {
   }
 
   public Animal className(String className) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -39,7 +39,7 @@ public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
-  public ArrayOfArrayOfNumberOnly() { 
+  public ArrayOfArrayOfNumberOnly() {
   }
 
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -39,7 +39,7 @@ public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
 
-  public ArrayOfNumberOnly() { 
+  public ArrayOfNumberOnly() {
   }
 
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -47,7 +47,7 @@ public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
-  public ArrayTest() { 
+  public ArrayTest() {
   }
 
   public ArrayTest arrayOfString(List<String> arrayOfString) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/BigCat.java

@@ -85,7 +85,8 @@ public class BigCat extends Cat {
   public static final String JSON_PROPERTY_KIND = "kind";
   private KindEnum kind;
 
-  public BigCat() { 
+  public BigCat() {
+
   }
 
   public BigCat kind(KindEnum kind) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/BigCatAllOf.java

@@ -76,7 +76,7 @@ public class BigCatAllOf {
   public static final String JSON_PROPERTY_KIND = "kind";
   private KindEnum kind;
 
-  public BigCatAllOf() { 
+  public BigCatAllOf() {
   }
 
   public BigCatAllOf kind(KindEnum kind) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -56,7 +56,7 @@ public class Capitalization {
   public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
   private String ATT_NAME;
 
-  public Capitalization() { 
+  public Capitalization() {
   }
 
   public Capitalization smallCamel(String smallCamel) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java

@@ -50,7 +50,8 @@ public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
-  public Cat() { 
+  public Cat() {
+
   }
 
   public Cat declawed(Boolean declawed) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -37,7 +37,7 @@ public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
-  public CatAllOf() { 
+  public CatAllOf() {
   }
 
   public CatAllOf declawed(Boolean declawed) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java

@@ -40,7 +40,7 @@ public class Category {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name = "default-name";
 
-  public Category() { 
+  public Category() {
   }
 
   public Category id(Long id) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -37,7 +37,7 @@ public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
 
-  public ClassModel() { 
+  public ClassModel() {
   }
 
   public ClassModel propertyClass(String propertyClass) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java

@@ -36,7 +36,7 @@ public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
 
-  public Client() { 
+  public Client() {
   }
 
   public Client client(String client) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java

@@ -46,7 +46,8 @@ public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
-  public Dog() { 
+  public Dog() {
+
   }
 
   public Dog breed(String breed) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -37,7 +37,7 @@ public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
-  public DogAllOf() { 
+  public DogAllOf() {
   }
 
   public DogAllOf breed(String breed) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -112,7 +112,7 @@ public class EnumArrays {
   public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
   private List<ArrayEnumEnum> arrayEnum = null;
 
-  public EnumArrays() { 
+  public EnumArrays() {
   }
 
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -198,7 +198,7 @@ public class EnumTest {
   public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
   private OuterEnum outerEnum;
 
-  public EnumTest() { 
+  public EnumTest() {
   }
 
   public EnumTest enumString(EnumStringEnum enumString) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILES = "files";
   private List<ModelFile> files = null;
 
-  public FileSchemaTestClass() { 
+  public FileSchemaTestClass() {
   }
 
   public FileSchemaTestClass _file(ModelFile _file) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -94,7 +94,7 @@ public class FormatTest {
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
   private BigDecimal bigDecimal;
 
-  public FormatTest() { 
+  public FormatTest() {
   }
 
   public FormatTest integer(Integer integer) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_FOO = "foo";
   private String foo;
 
-  public HasOnlyReadOnly() { 
+  public HasOnlyReadOnly() {
   }
 
   @JsonCreator

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java

@@ -85,7 +85,7 @@ public class MapTest {
   public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
   private Map<String, Boolean> indirectMap = null;
 
-  public MapTest() { 
+  public MapTest() {
   }
 
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -49,7 +49,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP = "map";
   private Map<String, Animal> map = null;
 
-  public MixedPropertiesAndAdditionalPropertiesClass() { 
+  public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -42,7 +42,7 @@ public class Model200Response {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
   private String propertyClass;
 
-  public Model200Response() { 
+  public Model200Response() {
   }
 
   public Model200Response name(Integer name) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -45,7 +45,7 @@ public class ModelApiResponse {
   public static final String JSON_PROPERTY_MESSAGE = "message";
   private String message;
 
-  public ModelApiResponse() { 
+  public ModelApiResponse() {
   }
 
   public ModelApiResponse code(Integer code) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java

@@ -38,7 +38,7 @@ public class ModelFile {
   public static final String JSON_PROPERTY_SOURCE_U_R_I = "sourceURI";
   private String sourceURI;
 
-  public ModelFile() { 
+  public ModelFile() {
   }
 
   public ModelFile sourceURI(String sourceURI) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java

@@ -37,7 +37,7 @@ public class ModelList {
   public static final String JSON_PROPERTY_123LIST = "123-list";
   private String _123list;
 
-  public ModelList() { 
+  public ModelList() {
   }
 
   public ModelList _123list(String _123list) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -38,7 +38,7 @@ public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
 
-  public ModelReturn() { 
+  public ModelReturn() {
   }
 
   public ModelReturn _return(Integer _return) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java

@@ -49,7 +49,7 @@ public class Name {
   public static final String JSON_PROPERTY_123NUMBER = "123Number";
   private Integer _123number;
 
-  public Name() { 
+  public Name() {
   }
 
   @JsonCreator

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -37,7 +37,7 @@ public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
 
-  public NumberOnly() { 
+  public NumberOnly() {
   }
 
   public NumberOnly justNumber(BigDecimal justNumber) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java

@@ -94,7 +94,7 @@ public class Order {
   public static final String JSON_PROPERTY_COMPLETE = "complete";
   private Boolean complete = false;
 
-  public Order() { 
+  public Order() {
   }
 
   public Order id(Long id) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -45,7 +45,7 @@ public class OuterComposite {
   public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
   private Boolean myBoolean;
 
-  public OuterComposite() { 
+  public OuterComposite() {
   }
 
   public OuterComposite myNumber(BigDecimal myNumber) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java

@@ -100,7 +100,7 @@ public class Pet {
   public static final String JSON_PROPERTY_STATUS = "status";
   private StatusEnum status;
 
-  public Pet() { 
+  public Pet() {
   }
 
   public Pet id(Long id) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -40,7 +40,7 @@ public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAZ = "baz";
   private String baz;
 
-  public ReadOnlyFirst() { 
+  public ReadOnlyFirst() {
   }
 
   @JsonCreator

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java

@@ -37,7 +37,7 @@ public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
 
-  public SpecialModelName() { 
+  public SpecialModelName() {
   }
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java

@@ -40,7 +40,7 @@ public class Tag {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public Tag() { 
+  public Tag() {
   }
 
   public Tag id(Long id) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java

@@ -55,7 +55,7 @@ public class TypeHolderDefault {
   public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<>();
 
-  public TypeHolderDefault() { 
+  public TypeHolderDefault() {
   }
 
   public TypeHolderDefault stringItem(String stringItem) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java

@@ -59,7 +59,7 @@ public class TypeHolderExample {
   public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<>();
 
-  public TypeHolderExample() { 
+  public TypeHolderExample() {
   }
 
   public TypeHolderExample stringItem(String stringItem) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java

@@ -64,7 +64,7 @@ public class User {
   public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
   private Integer userStatus;
 
-  public User() { 
+  public User() {
   }
 
   public User id(Long id) {

samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/XmlItem.java

@@ -151,7 +151,7 @@ public class XmlItem {
   public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
   private List<Integer> prefixNsWrappedArray = null;
 
-  public XmlItem() { 
+  public XmlItem() {
   }
 
   public XmlItem attributeString(String attributeString) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesAnyType() { 
+  public AdditionalPropertiesAnyType() {
+
   }
 
   public AdditionalPropertiesAnyType name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -40,7 +40,8 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesArray() { 
+  public AdditionalPropertiesArray() {
+
   }
 
   public AdditionalPropertiesArray name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesBoolean() { 
+  public AdditionalPropertiesBoolean() {
+
   }
 
   public AdditionalPropertiesBoolean name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -81,7 +81,7 @@ public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
   private Object anytype3;
 
-  public AdditionalPropertiesClass() { 
+  public AdditionalPropertiesClass() {
   }
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesInteger() { 
+  public AdditionalPropertiesInteger() {
+
   }
 
   public AdditionalPropertiesInteger name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -40,7 +40,8 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesNumber() { 
+  public AdditionalPropertiesNumber() {
+
   }
 
   public AdditionalPropertiesNumber name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesObject() { 
+  public AdditionalPropertiesObject() {
+
   }
 
   public AdditionalPropertiesObject name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -39,7 +39,8 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public AdditionalPropertiesString() { 
+  public AdditionalPropertiesString() {
+
   }
 
   public AdditionalPropertiesString name(String name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java

@@ -58,7 +58,7 @@ public class Animal {
   public static final String JSON_PROPERTY_COLOR = "color";
   private String color = "red";
 
-  public Animal() { 
+  public Animal() {
   }
 
   public Animal className(String className) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
-  public ArrayOfArrayOfNumberOnly() { 
+  public ArrayOfArrayOfNumberOnly() {
   }
 
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -40,7 +40,7 @@ public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
 
-  public ArrayOfNumberOnly() { 
+  public ArrayOfNumberOnly() {
   }
 
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -48,7 +48,7 @@ public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
-  public ArrayTest() { 
+  public ArrayTest() {
   }
 
   public ArrayTest arrayOfString(List<String> arrayOfString) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java

@@ -86,7 +86,8 @@ public class BigCat extends Cat {
   public static final String JSON_PROPERTY_KIND = "kind";
   private KindEnum kind;
 
-  public BigCat() { 
+  public BigCat() {
+
   }
 
   public BigCat kind(KindEnum kind) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java

@@ -77,7 +77,7 @@ public class BigCatAllOf {
   public static final String JSON_PROPERTY_KIND = "kind";
   private KindEnum kind;
 
-  public BigCatAllOf() { 
+  public BigCatAllOf() {
   }
 
   public BigCatAllOf kind(KindEnum kind) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -57,7 +57,7 @@ public class Capitalization {
   public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
   private String ATT_NAME;
 
-  public Capitalization() { 
+  public Capitalization() {
   }
 
   public Capitalization smallCamel(String smallCamel) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java

@@ -51,7 +51,8 @@ public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
-  public Cat() { 
+  public Cat() {
+
   }
 
   public Cat declawed(Boolean declawed) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -38,7 +38,7 @@ public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
-  public CatAllOf() { 
+  public CatAllOf() {
   }
 
   public CatAllOf declawed(Boolean declawed) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java

@@ -41,7 +41,7 @@ public class Category {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name = "default-name";
 
-  public Category() { 
+  public Category() {
   }
 
   public Category id(Long id) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -38,7 +38,7 @@ public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
 
-  public ClassModel() { 
+  public ClassModel() {
   }
 
   public ClassModel propertyClass(String propertyClass) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java

@@ -37,7 +37,7 @@ public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
 
-  public Client() { 
+  public Client() {
   }
 
   public Client client(String client) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java

@@ -47,7 +47,8 @@ public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
-  public Dog() { 
+  public Dog() {
+
   }
 
   public Dog breed(String breed) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -38,7 +38,7 @@ public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
-  public DogAllOf() { 
+  public DogAllOf() {
   }
 
   public DogAllOf breed(String breed) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -113,7 +113,7 @@ public class EnumArrays {
   public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
   private List<ArrayEnumEnum> arrayEnum = null;
 
-  public EnumArrays() { 
+  public EnumArrays() {
   }
 
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -199,7 +199,7 @@ public class EnumTest {
   public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
   private OuterEnum outerEnum;
 
-  public EnumTest() { 
+  public EnumTest() {
   }
 
   public EnumTest enumString(EnumStringEnum enumString) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java

@@ -38,7 +38,7 @@ public class File {
   public static final String JSON_PROPERTY_SOURCE_U_R_I = "sourceURI";
   private String sourceURI;
 
-  public File() { 
+  public File() {
   }
 
   public File sourceURI(String sourceURI) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -44,7 +44,7 @@ public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILES = "files";
   private List<File> files = null;
 
-  public FileSchemaTestClass() { 
+  public FileSchemaTestClass() {
   }
 
   public FileSchemaTestClass file(File file) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -95,7 +95,7 @@ public class FormatTest {
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
   private BigDecimal bigDecimal;
 
-  public FormatTest() { 
+  public FormatTest() {
   }
 
   public FormatTest integer(Integer integer) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -42,7 +42,7 @@ public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_FOO = "foo";
   private String foo;
 
-  public HasOnlyReadOnly() { 
+  public HasOnlyReadOnly() {
   }
 
   @JsonCreator

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java

@@ -86,7 +86,7 @@ public class MapTest {
   public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
   private Map<String, Boolean> indirectMap = null;
 
-  public MapTest() { 
+  public MapTest() {
   }
 
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP = "map";
   private Map<String, Animal> map = null;
 
-  public MixedPropertiesAndAdditionalPropertiesClass() { 
+  public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -43,7 +43,7 @@ public class Model200Response {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
   private String propertyClass;
 
-  public Model200Response() { 
+  public Model200Response() {
   }
 
   public Model200Response name(Integer name) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -46,7 +46,7 @@ public class ModelApiResponse {
   public static final String JSON_PROPERTY_MESSAGE = "message";
   private String message;
 
-  public ModelApiResponse() { 
+  public ModelApiResponse() {
   }
 
   public ModelApiResponse code(Integer code) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java

@@ -38,7 +38,7 @@ public class ModelList {
   public static final String JSON_PROPERTY_123LIST = "123-list";
   private String _123list;
 
-  public ModelList() { 
+  public ModelList() {
   }
 
   public ModelList _123list(String _123list) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -39,7 +39,7 @@ public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
 
-  public ModelReturn() { 
+  public ModelReturn() {
   }
 
   public ModelReturn _return(Integer _return) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java

@@ -50,7 +50,7 @@ public class Name {
   public static final String JSON_PROPERTY_123NUMBER = "123Number";
   private Integer _123number;
 
-  public Name() { 
+  public Name() {
   }
 
   @JsonCreator

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -38,7 +38,7 @@ public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
 
-  public NumberOnly() { 
+  public NumberOnly() {
   }
 
   public NumberOnly justNumber(BigDecimal justNumber) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java

@@ -95,7 +95,7 @@ public class Order {
   public static final String JSON_PROPERTY_COMPLETE = "complete";
   private Boolean complete = false;
 
-  public Order() { 
+  public Order() {
   }
 
   public Order id(Long id) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -46,7 +46,7 @@ public class OuterComposite {
   public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
   private Boolean myBoolean;
 
-  public OuterComposite() { 
+  public OuterComposite() {
   }
 
   public OuterComposite myNumber(BigDecimal myNumber) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java

@@ -101,7 +101,7 @@ public class Pet {
   public static final String JSON_PROPERTY_STATUS = "status";
   private StatusEnum status;
 
-  public Pet() { 
+  public Pet() {
   }
 
   public Pet id(Long id) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAZ = "baz";
   private String baz;
 
-  public ReadOnlyFirst() { 
+  public ReadOnlyFirst() {
   }
 
   @JsonCreator

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java

@@ -38,7 +38,7 @@ public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
 
-  public SpecialModelName() { 
+  public SpecialModelName() {
   }
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java

@@ -41,7 +41,7 @@ public class Tag {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public Tag() { 
+  public Tag() {
   }
 
   public Tag id(Long id) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java

@@ -56,7 +56,7 @@ public class TypeHolderDefault {
   public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<>();
 
-  public TypeHolderDefault() { 
+  public TypeHolderDefault() {
   }
 
   public TypeHolderDefault stringItem(String stringItem) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java

@@ -60,7 +60,7 @@ public class TypeHolderExample {
   public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<>();
 
-  public TypeHolderExample() { 
+  public TypeHolderExample() {
   }
 
   public TypeHolderExample stringItem(String stringItem) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java

@@ -65,7 +65,7 @@ public class User {
   public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
   private Integer userStatus;
 
-  public User() { 
+  public User() {
   }
 
   public User id(Long id) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java

@@ -152,7 +152,7 @@ public class XmlItem {
   public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
   private List<Integer> prefixNsWrappedArray = null;
 
-  public XmlItem() { 
+  public XmlItem() {
   }
 
   public XmlItem attributeString(String attributeString) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -42,7 +42,7 @@ public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property";
   private Map<String, Map<String, String>> mapOfMapProperty = null;
 
-  public AdditionalPropertiesClass() { 
+  public AdditionalPropertiesClass() {
   }
 
   public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java

@@ -45,7 +45,7 @@ public class AllOfWithSingleRef {
   public static final String JSON_PROPERTY_SINGLE_REF_TYPE = "SingleRefType";
   private JsonNullable<SingleRefType> singleRefType = JsonNullable.<SingleRefType>undefined();
 
-  public AllOfWithSingleRef() { 
+  public AllOfWithSingleRef() {
   }
 
   public AllOfWithSingleRef username(String username) {