diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml
index 6401dbaddbbb..4bf70faf3b14 100644
--- a/.github/workflows/samples-spring.yaml
+++ b/.github/workflows/samples-spring.yaml
@@ -39,6 +39,7 @@ jobs:
           - samples/openapi3/server/petstore/springboot-delegate
           - samples/server/petstore/spring-boot-nullable-set
           - samples/server/petstore/spring-boot-defaultInterface-unhandledException
+          - samples/openapi3/server/petstore/spring-boot-oneof
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
diff --git a/bin/configs/spring-boot-oneof.yaml b/bin/configs/spring-boot-oneof.yaml
new file mode 100644
index 000000000000..a986fc8fabe3
--- /dev/null
+++ b/bin/configs/spring-boot-oneof.yaml
@@ -0,0 +1,10 @@
+generatorName: spring
+outputDir: samples/openapi3/server/petstore/spring-boot-oneof
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  groupId: org.openapitools.openapi3
+  documentationProvider: springdoc
+  artifactId: springboot-oneof
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index db0f18682bf6..a7711fde6956 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -843,7 +843,7 @@ public void postProcessParameter(CodegenParameter parameter) {
     @Override
     @SuppressWarnings("unused")
     public void preprocessOpenAPI(OpenAPI openAPI) {
-        if (useOneOfInterfaces) {
+        if (useOneOfInterfaces && openAPI.getComponents() != null) {
             // we process the openapi schema here to find oneOf schemas and create interface models for them
             Map<String, Schema> schemas = new HashMap<>(openAPI.getComponents().getSchemas());
             if (schemas == null) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index a01a9eca4966..fc9824002e0a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -1313,7 +1313,6 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         // recursively add import for mapping one type to multiple imports
@@ -1333,14 +1332,12 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
             }
         }
 
-        List<Object> models = (List<Object>) objs.get("models");
-
-        for (Object _mo : models) {
-            Map<String, Object> mo = (Map<String, Object>) _mo;
+        // add x-implements for serializable to all models
+        List<Map<String, Object>> models = (List<Map<String, Object>>) objs.get("models");
+        for (Map<String, Object> mo : models) {
             CodegenModel cm = (CodegenModel) mo.get("model");
-
-            cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
             if (this.serializableModel) {
+                cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
                 ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
             }
         }
@@ -2054,6 +2051,18 @@ private boolean shouldBeImplicitHeader(CodegenParameter parameter) {
         return StringUtils.isNotBlank(implicitHeadersRegex) && parameter.baseName.matches(implicitHeadersRegex);
     }
 
+    @Override
+    public void addImportsToOneOfInterface(List<Map<String, String>> imports) {
+        if (additionalProperties.containsKey(JACKSON)) {
+            for (String i : Arrays.asList("JsonSubTypes", "JsonTypeInfo")) {
+                Map<String, String> oneImport = new HashMap<>();
+                oneImport.put("import", importMapping.get(i));
+                if (!imports.contains(oneImport)) {
+                    imports.add(oneImport);
+                }
+            }
+        }
+    }
     @Override
     public List<VendorExtension> getSupportedVendorExtensions() {
         List<VendorExtension> extensions = super.getSupportedVendorExtensions();
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 59733304da47..c3bbd8308f51 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
@@ -281,6 +281,8 @@ public void processOpts() {
         }
 
         super.processOpts();
+        useOneOfInterfaces = true;
+        legacyDiscriminatorBehavior = false;
 
         if (DocumentationProvider.SPRINGFOX.equals(getDocumentationProvider())) {
             LOGGER.warn("The springfox documentation provider is deprecated for removal. Use the springdoc provider instead.");
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
index 077ba5d8719a..7a82dabbcba4 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
@@ -46,7 +46,7 @@ import javax.annotation.Generated;
 {{>enumOuterClass}}
 {{/isEnum}}
 {{^isEnum}}
-{{>pojo}}
+{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache
new file mode 100644
index 000000000000..7ec79444bb9a
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache
@@ -0,0 +1,13 @@
+{{>additionalModelTypeAnnotations}}
+{{#withXml}}
+{{>xmlAnnotation}}
+{{/withXml}}
+{{#discriminator}}
+{{>typeInfoAnnotation}}
+{{/discriminator}}
+{{>generatedAnnotation}}
+public interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}
\ 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 5cac3d03d820..45990ffe202f 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -25,7 +25,7 @@
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
-public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{^parent}}{{#hateoas}}extends RepresentationModel<{{classname}}> {{/hateoas}}{{/parent}} {{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}{{#hateoas}} extends RepresentationModel<{{classname}}> {{/hateoas}}{{/parent}}{{#vendorExtensions.x-implements}}{{#-first}} implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
 {{#serializableModel}}
 
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/typeInfoAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
index 2a5646c327c3..c2b7f0c89dae 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
@@ -1,11 +1,21 @@
 {{#jackson}}
+{{#discriminator.mappedModels}}
+{{#-first}}
 @JsonIgnoreProperties(
   value = "{{{discriminator.propertyBaseName}}}", // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
   allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
 )
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
 @JsonSubTypes({
-  {{#discriminator.mappedModels}}
-  @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),
-  {{/discriminator.mappedModels}}
-}){{/jackson}}
\ No newline at end of file
+{{/-first}}
+  {{^vendorExtensions.x-discriminator-value}}
+  @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{{mappingName}}}"){{^-last}},{{/-last}}
+  {{/vendorExtensions.x-discriminator-value}}
+  {{#vendorExtensions.x-discriminator-value}}
+  @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{{vendorExtensions.x-discriminator-value}}}"){{^-last}},{{/-last}}
+  {{/vendorExtensions.x-discriminator-value}}
+{{#-last}}
+})
+{{/-last}}
+{{/discriminator.mappedModels}}
+{{/jackson}}
\ No newline at end of file
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 a8ce2b410f88..472d9867741f 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
@@ -947,6 +947,44 @@ public void shouldNotAddNotNullOnReadOnlyAttributes() throws IOException {
 
     }
 
+    @Test
+    public void oneOf_5381() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+        String outputPath = output.getAbsolutePath().replace('\\', '/');
+        OpenAPI openAPI = new OpenAPIParser()
+            .readLocation("src/test/resources/3_0/issue_5381.yaml", null, new ParseOptions()).getOpenAPI();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+        codegen.setUseOneOfInterfaces(true);
+
+        ClientOptInput input = new ClientOptInput();
+        input.openAPI(openAPI);
+        input.config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        codegen.setHateoas(true);
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        //generator.setGeneratorPropertyDefault(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "false");
+
+        codegen.setUseOneOfInterfaces(true);
+        codegen.setLegacyDiscriminatorBehavior(false);
+
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false");
+
+        generator.opts(input).generate();
+
+        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Foo.java"), "public class Foo implements FooRefOrValue");
+        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/FooRef.java"), "public class FooRef implements FooRefOrValue");
+        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/FooRefOrValue.java"), "public interface FooRefOrValue");
+    }
+
     @Test
     public void testTypeMappings() {
         final SpringCodegen codegen = new SpringCodegen();
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml
new file mode 100644
index 000000000000..192c958f7245
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml
@@ -0,0 +1,134 @@
+openapi: 3.0.1
+info:
+  title: ByRefOrValue
+  description: >
+    This tests for a oneOf interface representation
+  version: 0.0.1
+servers:
+  - url: "http://localhost:8080"
+tags:
+  - name: Foo
+paths:
+  /foo:
+    get:
+      tags:
+        - Foo
+      summary: GET all Foos
+      operationId: getAllFoos
+      responses:
+        '200':
+          $ref: '#/components/responses/200FooArray'
+    post:
+      tags:
+        - Foo
+      summary: Create a Foo
+      operationId: createFoo
+      requestBody:
+        $ref: '#/components/requestBodies/Foo'
+      responses:
+        '201':
+          $ref: '#/components/responses/201Foo'
+
+components:
+  schemas:
+    Entity:
+      type: object
+      allOf:
+        - "$ref": "#/components/schemas/Addressable"
+        - "$ref": "#/components/schemas/Extensible"
+
+    EntityRef:
+      description: Entity reference schema to be use for all entityRef class.
+      type: object
+      properties:
+        name:
+          type: string
+          description: Name of the related entity.
+        '@referredType':
+          type: string
+          description: The actual type of the target instance when needed for disambiguation.
+      allOf:
+        - $ref: '#/components/schemas/Addressable'
+        - "$ref": "#/components/schemas/Extensible"
+
+
+    Addressable:
+      type: object
+      properties:
+        href:
+          type: string
+          description: Hyperlink reference
+        id:
+          type: string
+          description: unique identifier
+      description: Base schema for adressable entities
+    Extensible:
+      type: object
+      properties:
+        "@schemaLocation":
+          type: string
+          description: A URI to a JSON-Schema file that defines additional attributes
+            and relationships
+        "@baseType":
+          type: string
+          description: When sub-classing, this defines the super-class
+        "@type":
+          type: string
+          description: When sub-classing, this defines the sub-class Extensible name
+      required:
+        - '@type'
+
+    FooRefOrValue:
+      type: object
+      oneOf:
+        - $ref: "#/components/schemas/Foo"
+        - $ref: "#/components/schemas/FooRef"
+      discriminator:
+        propertyName: "@type"
+        mapping:
+          Foo: "#/components/schemas/Foo"
+          FooRef: "#/components/schemas/FooRef"
+
+    Foo:
+      type: object
+      properties:
+        fooPropA:
+          type: string
+        fooPropB:
+          type: string
+      allOf:
+        - $ref: '#/components/schemas/Entity'
+
+    FooRef:
+      type: object
+      properties:
+        foorefPropA:
+          type: string
+      allOf:
+        - $ref: '#/components/schemas/EntityRef'
+
+  requestBodies:
+    Foo:
+      description: The Foo to be created
+      content:
+        application/json;charset=utf-8:
+          schema:
+            $ref: '#/components/schemas/Foo'
+  responses:
+    '204':
+      description: Deleted
+      content: { }
+    201Foo:
+      description: Error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/FooRefOrValue'
+    200FooArray:
+      description: Success
+      content:
+        application/json;charset=utf-8:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/FooRefOrValue'
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml b/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
new file mode 100644
index 000000000000..ec0120ca4f21
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
@@ -0,0 +1,178 @@
+openapi: 3.0.1
+info:
+  title: ByRefOrValue
+  description: >
+    This tests for a oneOf interface representation
+  version: 0.0.1
+servers:
+  - url: "http://localhost:8080"
+tags:
+  - name: Foo
+  - name: Bar
+paths:
+  /foo:
+    get:
+      tags:
+        - Foo
+      summary: GET all Foos
+      operationId: getAllFoos
+      responses:
+        '200':
+          $ref: '#/components/responses/200FooArray'
+    post:
+      tags:
+        - Foo
+      summary: Create a Foo
+      operationId: createFoo
+      requestBody:
+        $ref: '#/components/requestBodies/Foo'
+      responses:
+        '201':
+          $ref: '#/components/responses/201Foo'
+  /bar:
+    post:
+      tags:
+        - Bar
+      summary: Create a Bar
+      operationId: createBar
+      requestBody:
+        required: true
+        content:
+          'application/json':
+            schema:
+              $ref: '#/components/schemas/Bar_Create'
+      responses:
+        200:
+          description: Bar created
+          content:
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Bar'
+
+components:
+  schemas:
+    Addressable:
+      type: object
+      properties:
+        href:
+          type: string
+          description: Hyperlink reference
+        id:
+          type: string
+          description: unique identifier
+      description: Base schema for adressable entities
+    Extensible:
+      type: object
+      properties:
+        "@schemaLocation":
+          type: string
+          description: A URI to a JSON-Schema file that defines additional attributes
+            and relationships
+        "@baseType":
+          type: string
+          description: When sub-classing, this defines the super-class
+        "@type":
+          type: string
+          description: When sub-classing, this defines the sub-class Extensible name
+      required:
+        - '@type'
+    Entity:
+      type: object
+      discriminator:
+        propertyName: '@type'
+      allOf:
+        - "$ref": "#/components/schemas/Addressable"
+        - "$ref": "#/components/schemas/Extensible"
+    EntityRef:
+      type: object
+      discriminator:
+        propertyName: '@type'
+      description: Entity reference schema to be use for all entityRef class.
+      properties:
+        name:
+          type: string
+          description: Name of the related entity.
+        '@referredType':
+          type: string
+          description: The actual type of the target instance when needed for disambiguation.
+      allOf:
+        - $ref: '#/components/schemas/Addressable'
+        - "$ref": "#/components/schemas/Extensible"
+    FooRefOrValue:
+      type: object
+      oneOf:
+        - $ref: "#/components/schemas/Foo"
+        - $ref: "#/components/schemas/FooRef"
+      discriminator:
+        propertyName: "@type"
+    Foo:
+      type: object
+      properties:
+        fooPropA:
+          type: string
+        fooPropB:
+          type: string
+      allOf:
+        - $ref: '#/components/schemas/Entity'
+    FooRef:
+      type: object
+      discriminator:
+        propertyName: '@type'
+      properties:
+        foorefPropA:
+          type: string
+      allOf:
+        - $ref: '#/components/schemas/EntityRef'
+    Bar_Create:
+      type: object
+      properties:
+        barPropA:
+          type: string
+        fooPropB:
+          type: string
+        foo:
+          $ref: '#/components/schemas/FooRefOrValue'
+      allOf:
+        - $ref: '#/components/schemas/Entity'
+    Bar:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: string
+        barPropA:
+          type: string
+        fooPropB:
+          type: string
+        foo:
+          $ref: '#/components/schemas/FooRefOrValue'
+      allOf:
+        - $ref: '#/components/schemas/Entity'
+
+  requestBodies:
+    Foo:
+      description: The Foo to be created
+      content:
+        application/json;charset=utf-8:
+          schema:
+            $ref: '#/components/schemas/Foo'
+
+  responses:
+    '204':
+      description: Deleted
+      content: { }
+    201Foo:
+      description: Error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/FooRefOrValue'
+    200FooArray:
+      description: Success
+      content:
+        application/json;charset=utf-8:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/FooRefOrValue'
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
index af9a5d3bbec9..9f5ef4d9f1ad 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index eb9d1d35f36d..52fb11fd3cf7 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
index 658d0de71681..66d9df6dfd95 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
@@ -24,7 +24,7 @@
 
 @ApiModel(description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index 1c0c076a38c1..1962262aea94 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@
 
 @ApiModel(description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
index 86be70f2d3ed..b30aa3fd9a2c 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
index e350716a9338..8d71f0fcc040 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index 545876e8643f..5523df897c1e 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("@type")
   private String atType = "Pet";
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
index af9a5d3bbec9..9f5ef4d9f1ad 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index eb9d1d35f36d..52fb11fd3cf7 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 658d0de71681..66d9df6dfd95 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -24,7 +24,7 @@
 
 @ApiModel(description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index 1c0c076a38c1..1962262aea94 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@
 
 @ApiModel(description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index 86be70f2d3ed..b30aa3fd9a2c 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
index e350716a9338..8d71f0fcc040 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index a34d3d591218..909b0aba4e34 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index eb9d1d35f36d..52fb11fd3cf7 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index 658d0de71681..66d9df6dfd95 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -24,7 +24,7 @@
 
 @ApiModel(description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index 1c0c076a38c1..1962262aea94 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@
 
 @ApiModel(description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index 86be70f2d3ed..b30aa3fd9a2c 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index e350716a9338..8d71f0fcc040 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
index af9a5d3bbec9..9f5ef4d9f1ad 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
index eb9d1d35f36d..52fb11fd3cf7 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
index 658d0de71681..66d9df6dfd95 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
@@ -24,7 +24,7 @@
 
 @ApiModel(description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index 1c0c076a38c1..1962262aea94 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@
 
 @ApiModel(description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
index 86be70f2d3ed..b30aa3fd9a2c 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
index e350716a9338..8d71f0fcc040 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
index 03e4a4ce0b51..ed3c428e34a3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index ea6a030db272..e928a0c2c1f5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("@type")
   private String atType = "Pet";
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 275a075f527d..375c8ce6e448 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 0b3c8b8759b2..7e195225a7e0 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
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 36f36600dafa..2201d26277a1 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
index 03e4a4ce0b51..ed3c428e34a3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index 823adb2ae4d8..24264bce8b2d 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
index 03e4a4ce0b51..ed3c428e34a3 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
index 03e4a4ce0b51..ed3c428e34a3 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator-ignore b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator-ignore
new file mode 100644
index 000000000000..7484ee590a38
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES
new file mode 100644
index 000000000000..422e07678a14
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES
@@ -0,0 +1,22 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/OpenApiGeneratorApplication.java
+src/main/java/org/openapitools/RFC3339DateFormat.java
+src/main/java/org/openapitools/api/ApiUtil.java
+src/main/java/org/openapitools/api/BarApi.java
+src/main/java/org/openapitools/api/BarApiController.java
+src/main/java/org/openapitools/api/FooApi.java
+src/main/java/org/openapitools/api/FooApiController.java
+src/main/java/org/openapitools/configuration/HomeController.java
+src/main/java/org/openapitools/model/Addressable.java
+src/main/java/org/openapitools/model/Bar.java
+src/main/java/org/openapitools/model/BarCreate.java
+src/main/java/org/openapitools/model/Entity.java
+src/main/java/org/openapitools/model/EntityRef.java
+src/main/java/org/openapitools/model/Extensible.java
+src/main/java/org/openapitools/model/Foo.java
+src/main/java/org/openapitools/model/FooRef.java
+src/main/java/org/openapitools/model/FooRefOrValue.java
+src/main/resources/application.properties
+src/main/resources/openapi.yaml
+src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION
new file mode 100644
index 000000000000..5f68295fc196
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION
@@ -0,0 +1 @@
+6.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/README.md b/samples/openapi3/server/petstore/spring-boot-oneof/README.md
new file mode 100644
index 000000000000..5cd22b6081a2
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/README.md
@@ -0,0 +1,21 @@
+# OpenAPI generated server
+
+Spring Boot Server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub.
+This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework.
+
+
+The underlying library integrating OpenAPI to Spring Boot is [springdoc](https://springdoc.org).
+Springdoc will generate an OpenAPI v3 specification based on the generated Controller and Model classes.
+The specification is available to download using the following url:
+http://localhost:8080/v3/api-docs/
+
+Start your server as a simple java application
+
+You can view the api documentation in swagger-ui by pointing to
+http://localhost:8080/swagger-ui.html
+
+Change default port value in application.properties
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml
new file mode 100644
index 000000000000..ec6b0561a820
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml
@@ -0,0 +1,78 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools.openapi3</groupId>
+    <artifactId>springboot-oneof</artifactId>
+    <packaging>jar</packaging>
+    <name>springboot-oneof</name>
+    <version>0.0.1-SNAPSHOT</version>
+    <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <springdoc.version>1.6.4</springdoc.version>
+        <swagger-ui.version>4.4.1-1</swagger-ui.version>
+    </properties>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.3</version>
+    </parent>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+          <!--SpringDoc dependencies -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>0.2.2</version>
+        </dependency>
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
new file mode 100644
index 000000000000..f62fd6d91797
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
@@ -0,0 +1,23 @@
+package org.openapitools;
+
+import com.fasterxml.jackson.databind.Module;
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"})
+public class OpenApiGeneratorApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(OpenApiGeneratorApplication.class, args);
+    }
+
+    @Bean
+    public Module jsonNullableModule() {
+        return new JsonNullableModule();
+    }
+
+}
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/RFC3339DateFormat.java
new file mode 100644
index 000000000000..bcd3936d8b34
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/RFC3339DateFormat.java
@@ -0,0 +1,38 @@
+package org.openapitools;
+
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
+
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  public RFC3339DateFormat() {
+    this.calendar = new GregorianCalendar();
+  }
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+    return fmt.format(date, toAppendTo, fieldPosition);
+  }
+
+  @Override
+  public Object clone() {
+    return this;
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/ApiUtil.java
new file mode 100644
index 000000000000..1245b1dd0ccf
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/ApiUtil.java
@@ -0,0 +1,19 @@
+package org.openapitools.api;
+
+import org.springframework.web.context.request.NativeWebRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class ApiUtil {
+    public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
+        try {
+            HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
+            res.setCharacterEncoding("UTF-8");
+            res.addHeader("Content-Type", contentType);
+            res.getWriter().print(example);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java
new file mode 100644
index 000000000000..ee9f60cce496
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java
@@ -0,0 +1,80 @@
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package org.openapitools.api;
+
+import org.openapitools.model.Bar;
+import org.openapitools.model.BarCreate;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Validated
+@Tag(name = "bar", description = "the bar API")
+public interface BarApi {
+
+    default Optional<NativeWebRequest> getRequest() {
+        return Optional.empty();
+    }
+
+    /**
+     * POST /bar : Create a Bar
+     *
+     * @param barCreate  (required)
+     * @return Bar created (status code 200)
+     */
+    @Operation(
+        operationId = "createBar",
+        summary = "Create a Bar",
+        tags = { "Bar" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "Bar created", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = Bar.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.POST,
+        value = "/bar",
+        produces = { "application/json" },
+        consumes = { "application/json" }
+    )
+    default ResponseEntity<Bar> createBar(
+        @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"barPropA\" : \"barPropA\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java
new file mode 100644
index 000000000000..7d23950718d3
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java
@@ -0,0 +1,47 @@
+package org.openapitools.api;
+
+import org.openapitools.model.Bar;
+import org.openapitools.model.BarCreate;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Controller
+@RequestMapping("${openapi.byRefOrValue.base-path:}")
+public class BarApiController implements BarApi {
+
+    private final NativeWebRequest request;
+
+    @Autowired
+    public BarApiController(NativeWebRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public Optional<NativeWebRequest> getRequest() {
+        return Optional.ofNullable(request);
+    }
+
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java
new file mode 100644
index 000000000000..12fb31195d73
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java
@@ -0,0 +1,117 @@
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package org.openapitools.api;
+
+import org.openapitools.model.Foo;
+import org.openapitools.model.FooRefOrValue;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Validated
+@Tag(name = "foo", description = "the foo API")
+public interface FooApi {
+
+    default Optional<NativeWebRequest> getRequest() {
+        return Optional.empty();
+    }
+
+    /**
+     * POST /foo : Create a Foo
+     *
+     * @param foo The Foo to be created (optional)
+     * @return Error (status code 201)
+     */
+    @Operation(
+        operationId = "createFoo",
+        summary = "Create a Foo",
+        tags = { "Foo" },
+        responses = {
+            @ApiResponse(responseCode = "201", description = "Error", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = FooRefOrValue.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.POST,
+        value = "/foo",
+        produces = { "application/json" },
+        consumes = { "application/json;charset=utf-8" }
+    )
+    default ResponseEntity<FooRefOrValue> createFoo(
+        @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) Foo foo
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "null";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    /**
+     * GET /foo : GET all Foos
+     *
+     * @return Success (status code 200)
+     */
+    @Operation(
+        operationId = "getAllFoos",
+        summary = "GET all Foos",
+        tags = { "Foo" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "Success", content = {
+                @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = FooRefOrValue.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/foo",
+        produces = { "application/json;charset=utf-8" }
+    )
+    default ResponseEntity<List<FooRefOrValue>> getAllFoos(
+        
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json;charset=utf-8"))) {
+                    String exampleString = "null";
+                    ApiUtil.setExampleResponse(request, "application/json;charset=utf-8", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java
new file mode 100644
index 000000000000..ea240bf97a97
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java
@@ -0,0 +1,47 @@
+package org.openapitools.api;
+
+import org.openapitools.model.Foo;
+import org.openapitools.model.FooRefOrValue;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+@Controller
+@RequestMapping("${openapi.byRefOrValue.base-path:}")
+public class FooApiController implements FooApi {
+
+    private final NativeWebRequest request;
+
+    @Autowired
+    public FooApiController(NativeWebRequest request) {
+        this.request = request;
+    }
+
+    @Override
+    public Optional<NativeWebRequest> getRequest() {
+        return Optional.ofNullable(request);
+    }
+
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/HomeController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/HomeController.java
new file mode 100644
index 000000000000..9aa29284ab5f
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/HomeController.java
@@ -0,0 +1,20 @@
+package org.openapitools.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * Home redirection to OpenAPI api documentation
+ */
+@Controller
+public class HomeController {
+
+    @RequestMapping("/")
+    public String index() {
+        return "redirect:swagger-ui.html";
+    }
+
+}
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
new file mode 100644
index 000000000000..2cc692ebfcb3
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
@@ -0,0 +1,108 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Base schema for adressable entities
+ */
+
+@Schema(name = "Addressable", description = "Base schema for adressable entities")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class Addressable {
+
+  @JsonProperty("href")
+  private String href;
+
+  @JsonProperty("id")
+  private String id;
+
+  public Addressable href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  /**
+   * Hyperlink reference
+   * @return href
+  */
+  
+  @Schema(name = "href", description = "Hyperlink reference", required = false)
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public Addressable id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * unique identifier
+   * @return id
+  */
+  
+  @Schema(name = "id", description = "unique identifier", required = false)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Addressable addressable = (Addressable) o;
+    return Objects.equals(this.href, addressable.href) &&
+        Objects.equals(this.id, addressable.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(href, id);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Addressable {\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
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
new file mode 100644
index 000000000000..1efd29303f15
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
@@ -0,0 +1,163 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.Entity;
+import org.openapitools.model.FooRefOrValue;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Bar
+ */
+
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class Bar extends Entity {
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("barPropA")
+  private String barPropA;
+
+  @JsonProperty("fooPropB")
+  private String fooPropB;
+
+  @JsonProperty("foo")
+  private FooRefOrValue foo;
+
+  public Bar id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Get id
+   * @return id
+  */
+  @NotNull 
+  @Schema(name = "id", required = true)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public Bar barPropA(String barPropA) {
+    this.barPropA = barPropA;
+    return this;
+  }
+
+  /**
+   * Get barPropA
+   * @return barPropA
+  */
+  
+  @Schema(name = "barPropA", required = false)
+  public String getBarPropA() {
+    return barPropA;
+  }
+
+  public void setBarPropA(String barPropA) {
+    this.barPropA = barPropA;
+  }
+
+  public Bar fooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+    return this;
+  }
+
+  /**
+   * Get fooPropB
+   * @return fooPropB
+  */
+  
+  @Schema(name = "fooPropB", required = false)
+  public String getFooPropB() {
+    return fooPropB;
+  }
+
+  public void setFooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+  }
+
+  public Bar foo(FooRefOrValue foo) {
+    this.foo = foo;
+    return this;
+  }
+
+  /**
+   * Get foo
+   * @return foo
+  */
+  @Valid 
+  @Schema(name = "foo", required = false)
+  public FooRefOrValue getFoo() {
+    return foo;
+  }
+
+  public void setFoo(FooRefOrValue foo) {
+    this.foo = foo;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Bar bar = (Bar) o;
+    return Objects.equals(this.id, bar.id) &&
+        Objects.equals(this.barPropA, bar.barPropA) &&
+        Objects.equals(this.fooPropB, bar.fooPropB) &&
+        Objects.equals(this.foo, bar.foo) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, barPropA, fooPropB, foo, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Bar {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    barPropA: ").append(toIndentedString(barPropA)).append("\n");
+    sb.append("    fooPropB: ").append(toIndentedString(fooPropB)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
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
new file mode 100644
index 000000000000..15a33a51b68a
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
@@ -0,0 +1,141 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.openapitools.model.Entity;
+import org.openapitools.model.FooRefOrValue;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * BarCreate
+ */
+
+
+@JsonTypeName("Bar_Create")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class BarCreate extends Entity {
+
+  @JsonProperty("barPropA")
+  private String barPropA;
+
+  @JsonProperty("fooPropB")
+  private String fooPropB;
+
+  @JsonProperty("foo")
+  private FooRefOrValue foo;
+
+  public BarCreate barPropA(String barPropA) {
+    this.barPropA = barPropA;
+    return this;
+  }
+
+  /**
+   * Get barPropA
+   * @return barPropA
+  */
+  
+  @Schema(name = "barPropA", required = false)
+  public String getBarPropA() {
+    return barPropA;
+  }
+
+  public void setBarPropA(String barPropA) {
+    this.barPropA = barPropA;
+  }
+
+  public BarCreate fooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+    return this;
+  }
+
+  /**
+   * Get fooPropB
+   * @return fooPropB
+  */
+  
+  @Schema(name = "fooPropB", required = false)
+  public String getFooPropB() {
+    return fooPropB;
+  }
+
+  public void setFooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+  }
+
+  public BarCreate foo(FooRefOrValue foo) {
+    this.foo = foo;
+    return this;
+  }
+
+  /**
+   * Get foo
+   * @return foo
+  */
+  @Valid 
+  @Schema(name = "foo", required = false)
+  public FooRefOrValue getFoo() {
+    return foo;
+  }
+
+  public void setFoo(FooRefOrValue foo) {
+    this.foo = foo;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BarCreate barCreate = (BarCreate) o;
+    return Objects.equals(this.barPropA, barCreate.barPropA) &&
+        Objects.equals(this.fooPropB, barCreate.fooPropB) &&
+        Objects.equals(this.foo, barCreate.foo) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(barPropA, fooPropB, foo, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BarCreate {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    barPropA: ").append(toIndentedString(barPropA)).append("\n");
+    sb.append("    fooPropB: ").append(toIndentedString(fooPropB)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
new file mode 100644
index 000000000000..846a860f6998
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
@@ -0,0 +1,198 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.Addressable;
+import org.openapitools.model.Bar;
+import org.openapitools.model.BarCreate;
+import org.openapitools.model.Extensible;
+import org.openapitools.model.Foo;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Entity
+ */
+
+@JsonIgnoreProperties(
+  value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the @type to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Bar.class, name = "Bar"),
+  @JsonSubTypes.Type(value = BarCreate.class, name = "Bar_Create"),
+  @JsonSubTypes.Type(value = Foo.class, name = "Foo")
+})
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class Entity {
+
+  @JsonProperty("href")
+  private String href;
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("@schemaLocation")
+  private String atSchemaLocation;
+
+  @JsonProperty("@baseType")
+  private String atBaseType;
+
+  @JsonProperty("@type")
+  private String atType;
+
+  public Entity href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  /**
+   * Hyperlink reference
+   * @return href
+  */
+  
+  @Schema(name = "href", description = "Hyperlink reference", required = false)
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public Entity id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * unique identifier
+   * @return id
+  */
+  
+  @Schema(name = "id", description = "unique identifier", required = false)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public Entity atSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+    return this;
+  }
+
+  /**
+   * A URI to a JSON-Schema file that defines additional attributes and relationships
+   * @return atSchemaLocation
+  */
+  
+  @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false)
+  public String getAtSchemaLocation() {
+    return atSchemaLocation;
+  }
+
+  public void setAtSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+  }
+
+  public Entity atBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the super-class
+   * @return atBaseType
+  */
+  
+  @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false)
+  public String getAtBaseType() {
+    return atBaseType;
+  }
+
+  public void setAtBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+  }
+
+  public Entity atType(String atType) {
+    this.atType = atType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the sub-class Extensible name
+   * @return atType
+  */
+  @NotNull 
+  @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true)
+  public String getAtType() {
+    return atType;
+  }
+
+  public void setAtType(String atType) {
+    this.atType = atType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Entity entity = (Entity) o;
+    return Objects.equals(this.href, entity.href) &&
+        Objects.equals(this.id, entity.id) &&
+        Objects.equals(this.atSchemaLocation, entity.atSchemaLocation) &&
+        Objects.equals(this.atBaseType, entity.atBaseType) &&
+        Objects.equals(this.atType, entity.atType);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(href, id, atSchemaLocation, atBaseType, atType);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Entity {\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");
+    sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");
+    sb.append("    atType: ").append(toIndentedString(atType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
new file mode 100644
index 000000000000..2c5e68a517f9
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
@@ -0,0 +1,243 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.Addressable;
+import org.openapitools.model.Extensible;
+import org.openapitools.model.FooRef;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Entity reference schema to be use for all entityRef class.
+ */
+
+@Schema(name = "EntityRef", description = "Entity reference schema to be use for all entityRef class.")
+@JsonIgnoreProperties(
+  value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the @type to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = FooRef.class, name = "FooRef")
+})
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class EntityRef {
+
+  @JsonProperty("name")
+  private String name;
+
+  @JsonProperty("@referredType")
+  private String atReferredType;
+
+  @JsonProperty("href")
+  private String href;
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("@schemaLocation")
+  private String atSchemaLocation;
+
+  @JsonProperty("@baseType")
+  private String atBaseType;
+
+  @JsonProperty("@type")
+  private String atType;
+
+  public EntityRef name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Name of the related entity.
+   * @return name
+  */
+  
+  @Schema(name = "name", description = "Name of the related entity.", required = false)
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public EntityRef atReferredType(String atReferredType) {
+    this.atReferredType = atReferredType;
+    return this;
+  }
+
+  /**
+   * The actual type of the target instance when needed for disambiguation.
+   * @return atReferredType
+  */
+  
+  @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", required = false)
+  public String getAtReferredType() {
+    return atReferredType;
+  }
+
+  public void setAtReferredType(String atReferredType) {
+    this.atReferredType = atReferredType;
+  }
+
+  public EntityRef href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  /**
+   * Hyperlink reference
+   * @return href
+  */
+  
+  @Schema(name = "href", description = "Hyperlink reference", required = false)
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public EntityRef id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * unique identifier
+   * @return id
+  */
+  
+  @Schema(name = "id", description = "unique identifier", required = false)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public EntityRef atSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+    return this;
+  }
+
+  /**
+   * A URI to a JSON-Schema file that defines additional attributes and relationships
+   * @return atSchemaLocation
+  */
+  
+  @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false)
+  public String getAtSchemaLocation() {
+    return atSchemaLocation;
+  }
+
+  public void setAtSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+  }
+
+  public EntityRef atBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the super-class
+   * @return atBaseType
+  */
+  
+  @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false)
+  public String getAtBaseType() {
+    return atBaseType;
+  }
+
+  public void setAtBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+  }
+
+  public EntityRef atType(String atType) {
+    this.atType = atType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the sub-class Extensible name
+   * @return atType
+  */
+  @NotNull 
+  @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true)
+  public String getAtType() {
+    return atType;
+  }
+
+  public void setAtType(String atType) {
+    this.atType = atType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EntityRef entityRef = (EntityRef) o;
+    return Objects.equals(this.name, entityRef.name) &&
+        Objects.equals(this.atReferredType, entityRef.atReferredType) &&
+        Objects.equals(this.href, entityRef.href) &&
+        Objects.equals(this.id, entityRef.id) &&
+        Objects.equals(this.atSchemaLocation, entityRef.atSchemaLocation) &&
+        Objects.equals(this.atBaseType, entityRef.atBaseType) &&
+        Objects.equals(this.atType, entityRef.atType);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, atReferredType, href, id, atSchemaLocation, atBaseType, atType);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EntityRef {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    atReferredType: ").append(toIndentedString(atReferredType)).append("\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");
+    sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");
+    sb.append("    atType: ").append(toIndentedString(atType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
new file mode 100644
index 000000000000..f6a109c1d5f0
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
@@ -0,0 +1,131 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Extensible
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class Extensible {
+
+  @JsonProperty("@schemaLocation")
+  private String atSchemaLocation;
+
+  @JsonProperty("@baseType")
+  private String atBaseType;
+
+  @JsonProperty("@type")
+  private String atType;
+
+  public Extensible atSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+    return this;
+  }
+
+  /**
+   * A URI to a JSON-Schema file that defines additional attributes and relationships
+   * @return atSchemaLocation
+  */
+  
+  @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false)
+  public String getAtSchemaLocation() {
+    return atSchemaLocation;
+  }
+
+  public void setAtSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+  }
+
+  public Extensible atBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the super-class
+   * @return atBaseType
+  */
+  
+  @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false)
+  public String getAtBaseType() {
+    return atBaseType;
+  }
+
+  public void setAtBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+  }
+
+  public Extensible atType(String atType) {
+    this.atType = atType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the sub-class Extensible name
+   * @return atType
+  */
+  @NotNull 
+  @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true)
+  public String getAtType() {
+    return atType;
+  }
+
+  public void setAtType(String atType) {
+    this.atType = atType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Extensible extensible = (Extensible) o;
+    return Objects.equals(this.atSchemaLocation, extensible.atSchemaLocation) &&
+        Objects.equals(this.atBaseType, extensible.atBaseType) &&
+        Objects.equals(this.atType, extensible.atType);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(atSchemaLocation, atBaseType, atType);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Extensible {\n");
+    sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");
+    sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");
+    sb.append("    atType: ").append(toIndentedString(atType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
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
new file mode 100644
index 000000000000..d73ec9a9d5fa
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
@@ -0,0 +1,234 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.Entity;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * Foo
+ */
+
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class Foo extends Entity implements FooRefOrValue {
+
+  @JsonProperty("fooPropA")
+  private String fooPropA;
+
+  @JsonProperty("fooPropB")
+  private String fooPropB;
+
+  @JsonProperty("href")
+  private String href;
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("@schemaLocation")
+  private String atSchemaLocation;
+
+  @JsonProperty("@baseType")
+  private String atBaseType;
+
+  @JsonProperty("@type")
+  private String atType;
+
+  public Foo fooPropA(String fooPropA) {
+    this.fooPropA = fooPropA;
+    return this;
+  }
+
+  /**
+   * Get fooPropA
+   * @return fooPropA
+  */
+  
+  @Schema(name = "fooPropA", required = false)
+  public String getFooPropA() {
+    return fooPropA;
+  }
+
+  public void setFooPropA(String fooPropA) {
+    this.fooPropA = fooPropA;
+  }
+
+  public Foo fooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+    return this;
+  }
+
+  /**
+   * Get fooPropB
+   * @return fooPropB
+  */
+  
+  @Schema(name = "fooPropB", required = false)
+  public String getFooPropB() {
+    return fooPropB;
+  }
+
+  public void setFooPropB(String fooPropB) {
+    this.fooPropB = fooPropB;
+  }
+
+  public Foo href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  /**
+   * Hyperlink reference
+   * @return href
+  */
+  
+  @Schema(name = "href", description = "Hyperlink reference", required = false)
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public Foo id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * unique identifier
+   * @return id
+  */
+  
+  @Schema(name = "id", description = "unique identifier", required = false)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public Foo atSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+    return this;
+  }
+
+  /**
+   * A URI to a JSON-Schema file that defines additional attributes and relationships
+   * @return atSchemaLocation
+  */
+  
+  @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false)
+  public String getAtSchemaLocation() {
+    return atSchemaLocation;
+  }
+
+  public void setAtSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+  }
+
+  public Foo atBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the super-class
+   * @return atBaseType
+  */
+  
+  @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false)
+  public String getAtBaseType() {
+    return atBaseType;
+  }
+
+  public void setAtBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+  }
+
+  public Foo atType(String atType) {
+    this.atType = atType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the sub-class Extensible name
+   * @return atType
+  */
+  @NotNull 
+  @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true)
+  public String getAtType() {
+    return atType;
+  }
+
+  public void setAtType(String atType) {
+    this.atType = atType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Foo foo = (Foo) o;
+    return Objects.equals(this.fooPropA, foo.fooPropA) &&
+        Objects.equals(this.fooPropB, foo.fooPropB) &&
+        Objects.equals(this.href, foo.href) &&
+        Objects.equals(this.id, foo.id) &&
+        Objects.equals(this.atSchemaLocation, foo.atSchemaLocation) &&
+        Objects.equals(this.atBaseType, foo.atBaseType) &&
+        Objects.equals(this.atType, foo.atType) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(fooPropA, fooPropB, href, id, atSchemaLocation, atBaseType, atType, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Foo {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    fooPropA: ").append(toIndentedString(fooPropA)).append("\n");
+    sb.append("    fooPropB: ").append(toIndentedString(fooPropB)).append("\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");
+    sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");
+    sb.append("    atType: ").append(toIndentedString(atType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
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
new file mode 100644
index 000000000000..72c26b5de06f
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
@@ -0,0 +1,210 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.EntityRef;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * FooRef
+ */
+
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class FooRef extends EntityRef implements FooRefOrValue {
+
+  @JsonProperty("foorefPropA")
+  private String foorefPropA;
+
+  @JsonProperty("href")
+  private String href;
+
+  @JsonProperty("id")
+  private String id;
+
+  @JsonProperty("@schemaLocation")
+  private String atSchemaLocation;
+
+  @JsonProperty("@baseType")
+  private String atBaseType;
+
+  @JsonProperty("@type")
+  private String atType;
+
+  public FooRef foorefPropA(String foorefPropA) {
+    this.foorefPropA = foorefPropA;
+    return this;
+  }
+
+  /**
+   * Get foorefPropA
+   * @return foorefPropA
+  */
+  
+  @Schema(name = "foorefPropA", required = false)
+  public String getFoorefPropA() {
+    return foorefPropA;
+  }
+
+  public void setFoorefPropA(String foorefPropA) {
+    this.foorefPropA = foorefPropA;
+  }
+
+  public FooRef href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  /**
+   * Hyperlink reference
+   * @return href
+  */
+  
+  @Schema(name = "href", description = "Hyperlink reference", required = false)
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public FooRef id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * unique identifier
+   * @return id
+  */
+  
+  @Schema(name = "id", description = "unique identifier", required = false)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public FooRef atSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+    return this;
+  }
+
+  /**
+   * A URI to a JSON-Schema file that defines additional attributes and relationships
+   * @return atSchemaLocation
+  */
+  
+  @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false)
+  public String getAtSchemaLocation() {
+    return atSchemaLocation;
+  }
+
+  public void setAtSchemaLocation(String atSchemaLocation) {
+    this.atSchemaLocation = atSchemaLocation;
+  }
+
+  public FooRef atBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the super-class
+   * @return atBaseType
+  */
+  
+  @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false)
+  public String getAtBaseType() {
+    return atBaseType;
+  }
+
+  public void setAtBaseType(String atBaseType) {
+    this.atBaseType = atBaseType;
+  }
+
+  public FooRef atType(String atType) {
+    this.atType = atType;
+    return this;
+  }
+
+  /**
+   * When sub-classing, this defines the sub-class Extensible name
+   * @return atType
+  */
+  @NotNull 
+  @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true)
+  public String getAtType() {
+    return atType;
+  }
+
+  public void setAtType(String atType) {
+    this.atType = atType;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FooRef fooRef = (FooRef) o;
+    return Objects.equals(this.foorefPropA, fooRef.foorefPropA) &&
+        Objects.equals(this.href, fooRef.href) &&
+        Objects.equals(this.id, fooRef.id) &&
+        Objects.equals(this.atSchemaLocation, fooRef.atSchemaLocation) &&
+        Objects.equals(this.atBaseType, fooRef.atBaseType) &&
+        Objects.equals(this.atType, fooRef.atType) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(foorefPropA, href, id, atSchemaLocation, atBaseType, atType, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FooRef {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    foorefPropA: ").append(toIndentedString(foorefPropA)).append("\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");
+    sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");
+    sb.append("    atType: ").append(toIndentedString(atType)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java
new file mode 100644
index 000000000000..0984df6238cc
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java
@@ -0,0 +1,36 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.Foo;
+import org.openapitools.model.FooRef;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+
+@JsonIgnoreProperties(
+  value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the @type to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Foo.class, name = "Foo"),
+  @JsonSubTypes.Type(value = FooRef.class, name = "FooRef")
+})
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public interface FooRefOrValue {
+    public String getAtType();
+}
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/application.properties b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/application.properties
new file mode 100644
index 000000000000..7e90813e59b2
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+server.port=8080
+spring.jackson.date-format=org.openapitools.RFC3339DateFormat
+spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml
new file mode 100644
index 000000000000..1786fc2efd07
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml
@@ -0,0 +1,205 @@
+openapi: 3.0.1
+info:
+  description: |
+    This tests for a oneOf interface representation
+  title: ByRefOrValue
+  version: 0.0.1
+servers:
+- url: http://localhost:8080
+tags:
+- name: Foo
+- name: Bar
+paths:
+  /foo:
+    get:
+      operationId: getAllFoos
+      responses:
+        "200":
+          content:
+            application/json;charset=utf-8:
+              schema:
+                items:
+                  $ref: '#/components/schemas/FooRefOrValue'
+                type: array
+          description: Success
+      summary: GET all Foos
+      tags:
+      - Foo
+      x-accepts: application/json;charset=utf-8
+      x-tags:
+      - tag: Foo
+    post:
+      operationId: createFoo
+      requestBody:
+        $ref: '#/components/requestBodies/Foo'
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/FooRefOrValue'
+          description: Error
+      summary: Create a Foo
+      tags:
+      - Foo
+      x-contentType: application/json;charset=utf-8
+      x-accepts: application/json
+      x-tags:
+      - tag: Foo
+  /bar:
+    post:
+      operationId: createBar
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Bar_Create'
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Bar'
+          description: Bar created
+      summary: Create a Bar
+      tags:
+      - Bar
+      x-contentType: application/json
+      x-accepts: application/json
+      x-tags:
+      - tag: Bar
+components:
+  requestBodies:
+    Foo:
+      content:
+        application/json;charset=utf-8:
+          schema:
+            $ref: '#/components/schemas/Foo'
+      description: The Foo to be created
+  responses:
+    "204":
+      content: {}
+      description: Deleted
+    "201Foo":
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/FooRefOrValue'
+      description: Error
+    "200FooArray":
+      content:
+        application/json;charset=utf-8:
+          schema:
+            items:
+              $ref: '#/components/schemas/FooRefOrValue'
+            type: array
+      description: Success
+  schemas:
+    Addressable:
+      description: Base schema for adressable entities
+      properties:
+        href:
+          description: Hyperlink reference
+          type: string
+        id:
+          description: unique identifier
+          type: string
+      type: object
+    Extensible:
+      properties:
+        '@schemaLocation':
+          description: A URI to a JSON-Schema file that defines additional attributes
+            and relationships
+          type: string
+        '@baseType':
+          description: "When sub-classing, this defines the super-class"
+          type: string
+        '@type':
+          description: "When sub-classing, this defines the sub-class Extensible name"
+          type: string
+      required:
+      - '@type'
+      type: object
+    Entity:
+      allOf:
+      - $ref: '#/components/schemas/Addressable'
+      - $ref: '#/components/schemas/Extensible'
+      discriminator:
+        propertyName: '@type'
+      type: object
+    EntityRef:
+      allOf:
+      - $ref: '#/components/schemas/Addressable'
+      - $ref: '#/components/schemas/Extensible'
+      description: Entity reference schema to be use for all entityRef class.
+      discriminator:
+        propertyName: '@type'
+      properties:
+        name:
+          description: Name of the related entity.
+          type: string
+        '@referredType':
+          description: The actual type of the target instance when needed for disambiguation.
+          type: string
+      type: object
+    FooRefOrValue:
+      discriminator:
+        propertyName: '@type'
+      oneOf:
+      - $ref: '#/components/schemas/Foo'
+      - $ref: '#/components/schemas/FooRef'
+      type: object
+      x-one-of-name: FooRefOrValue
+    Foo:
+      allOf:
+      - $ref: '#/components/schemas/Entity'
+      example:
+        fooPropA: fooPropA
+        fooPropB: fooPropB
+      properties:
+        fooPropA:
+          type: string
+        fooPropB:
+          type: string
+      type: object
+    FooRef:
+      allOf:
+      - $ref: '#/components/schemas/EntityRef'
+      discriminator:
+        propertyName: '@type'
+      properties:
+        foorefPropA:
+          type: string
+      type: object
+    Bar_Create:
+      allOf:
+      - $ref: '#/components/schemas/Entity'
+      properties:
+        barPropA:
+          type: string
+        fooPropB:
+          type: string
+        foo:
+          $ref: '#/components/schemas/FooRefOrValue'
+      type: object
+    Bar:
+      allOf:
+      - $ref: '#/components/schemas/Entity'
+      example:
+        foo: null
+        id: id
+        fooPropB: fooPropB
+        barPropA: barPropA
+      properties:
+        id:
+          type: string
+        barPropA:
+          type: string
+        fooPropB:
+          type: string
+        foo:
+          $ref: '#/components/schemas/FooRefOrValue'
+      required:
+      - id
+      type: object
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java
new file mode 100644
index 000000000000..3681f67e7705
--- /dev/null
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java
@@ -0,0 +1,13 @@
+package org.openapitools;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class OpenApiGeneratorApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
index 823adb2ae4d8..24264bce8b2d 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
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 c21547ebe553..e01b3214db27 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
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 6f4b99f6bd22..ec428cb349f4 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 603425f75ee4..90527250a4d5 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
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 1de1495fee45..442b3f730a8d 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 7760ea488d8c..e71c315dbade 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
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 385adeaf6859..089260568478 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 01486fe5f8f9..d7852c1184a2 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
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 daceddcbd943..78fd51e521fc 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
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
index ec08d0d6d55a..44e94a714b7f 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
@@ -28,10 +31,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 9871634153fd..29b207211ca7 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 465cf68cf34f..c355a668b998 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
index 296e8f58112a..c69acc510f40 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
index e8cc7d889e63..3302e7f30ca0 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -20,8 +23,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
index ad9b04f2b436..622f8115d00d 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
index 58d6a300418f..58d0d2889dfa 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
index d97457af945b..3cb2a5dd4a32 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -19,8 +23,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
index 07c3fdf6735e..a7e5bd6ef8cb 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
index 7f6bb6e1e7a1..eadae546511a 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
index 140f237c1436..27ee22fe70e8 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
@@ -19,7 +19,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
index 57335b9a7e29..b314b7e6c40b 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
index 7e3a95ef951c..f03703acc48a 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import java.time.OffsetDateTime;
@@ -19,8 +22,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
index 9eae8470eca6..9115e097a41e 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
index 7f032e7b77f2..f6d26222d3d4 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
index 171fa442d872..5029217180eb 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
index 01328e7289d0..7aa43240699d 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
@@ -19,7 +19,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index a8ff92bd4a93..a8dde57867d8 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
index 8b97970dabc9..d1f46558af53 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -26,7 +26,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 6af4fea705e5..afca14167ef4 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
index ecdcea9ffb88..4a980ded67b3 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e421cb8aaf9e..1b26995e0f73 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -25,7 +25,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
index 38fee3569e92..cab3e70b2287 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
@@ -21,7 +21,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 924df8580f17..c9f3676db045 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
index 8b2ace12f892..752a252ea435 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
index 0b030e1b2450..83d5c50471b0 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -21,7 +21,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
index 2c89f8764d21..b056fee672b7 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
@@ -19,7 +19,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
index 164351c48a95..dd76d23b712a 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
index 99fcd106e326..9dde75062926 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
index 3b034d2add35..ee285c36534f 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
index 69f9cd6e8af0..f727b1fd13c2 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 580a50e935df..8a406167b2db 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
index fef701b6870f..b90088c84169 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
index 48d0ddacf537..8d89066ef81d 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index d3b55c685d80..aa063c93117a 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
index 04d047121942..eb2fb13585ba 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
index 7cc0ac4d18c8..05af7907f063 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
index c07275c07db1..7f777c900644 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 275a075f527d..375c8ce6e448 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 0b3c8b8759b2..7e195225a7e0 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
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 36f36600dafa..2201d26277a1 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 275a075f527d..375c8ce6e448 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 0b3c8b8759b2..7e195225a7e0 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
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 36f36600dafa..2201d26277a1 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
index 275a075f527d..375c8ce6e448 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
index 0b3c8b8759b2..7e195225a7e0 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
index 36f36600dafa..2201d26277a1 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
index 6218e1d3e171..0d2e56dfa3d9 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
index 279de49b2ce0..f66ed8b59413 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -20,7 +20,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
index 13ec59e549c9..aafcfc0cc192 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
index 05a9ea718d7a..c857f5804afd 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
index e3ba0c6d29a8..32f55514e089 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
index 8a27d52814ab..16f35830e845 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
@@ -18,7 +18,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
index 275a075f527d..375c8ce6e448 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
index 0b3c8b8759b2..7e195225a7e0 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
index 36f36600dafa..2201d26277a1 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
index 823adb2ae4d8..24264bce8b2d 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Category", description = "A category for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
index a235a99f9035..18e0004c3354 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 @Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
index e624a0d7c1fe..04bee348f98e 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
 
 @Schema(name = "Order", description = "An order for a pets from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index ddff66759bac..f702d09a1a82 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
 
 @Schema(name = "Pet", description = "A pet for sale in the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
index 5c3ac82ba6e8..b4d9d7b0a13b 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Tag", description = "A tag for a pet")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
index 328569672eb4..01b7db75ca7a 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "User", description = "A User who is purchasing from the pet store")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
index e8a00e182c54..d74962ea1914 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
@@ -28,7 +28,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
index cc75dd59249b..8a01264cac07 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   @JacksonXmlProperty(localName = "code")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
index 5e8e4d0fc1aa..d57417899844 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
@@ -31,7 +31,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
index 935f3db6d63f..43f830ce2952 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
@@ -33,7 +33,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
index a7beefc24152..84a8c85754e5 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
@@ -28,7 +28,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
index f8b1176d41bb..b7f1e01576b0 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
@@ -28,7 +28,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
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 88ea058c0c51..0d95d7f91b29 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 0d4d67f1a9e9..0a45cd0d195e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 219d797ee642..c53b449a5070 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b2245551ad3e..ae060d44dc4d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 ea102c40ed2e..87a903f3e7f2 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 7a3a5d839f8a..873d1c9c229e 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 22e47f1bc1cb..97827d22d963 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 91f47a9e83ee..53967d619036 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
index eb90fc64a460..8b3225fee193 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index ad560c9d8344..4fc6a6447db5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4409856d5a37..da4dc071cfdf 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
index fd25397b6b67..03052a955e3b 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 275a075f527d..375c8ce6e448 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
index 843e46a1f6cd..96ddb1f49cd8 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
index 80d6c5b28514..e7f3b66e4814 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 0b3c8b8759b2..7e195225a7e0 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
@@ -2,9 +2,13 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
index 88bc8c3d6492..bc83998fc4d5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
index 66dd429525dd..586658c922c5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
index 13a83893e619..d3d25d6df8cd 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
index 9fbd7e3b4338..7ed5fbaae188 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 36f36600dafa..2201d26277a1 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
index 1a4f50f5bcd4..fbcd7127e41b 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
index c3e82d4c0282..3c18fc1189fe 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
index fb2ee5373fbf..dc15f99afe84 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
index a2ee29fbfd69..d9a8ab4aa1f2 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "File", description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77868e774104..5794883ff564 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
index 05abfd1c26ef..c4bacc257a36 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 768e7277a703..d817048f2a75 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
index 2da2a81ac823..6942169188d2 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9681c13f29d4..bd1c5716f064 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
index 95f81f418d28..80ff3f1fc638 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @Schema(name = "200_response", description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
index 474ed54662f7..ed829bcb62cd 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
index 7615d501057e..56e79c554452 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
index eef02c8ade31..d95ce3f15491 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @Schema(name = "Return", description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
index 2876e64e9917..32cec75d981d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @Schema(name = "Name", description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
index 05c9f0a77856..14fb6641f919 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
index 90b0d2957184..9b54a719dbae 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
index 14ff8ff8a9f4..461f98baa866 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
index 51d583a02e55..c137885adb7f 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 1d95448aeefe..39862919e7c7 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
index 1eac86e9ebca..fb431f59071a 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
index 6b24df204718..75f3df1d0e17 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 66695c3e8478..4d939d69a1e7 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
index fdc9a0960759..c9b40aac5fa1 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
index 9aae48b0ceb2..9df36d407748 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
index b886d9d3f61e..3b3593e71797 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
index 505bcb3f327e..190950d867d5 100644
--- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
+++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ObjectWithUniqueItems   {
+public class ObjectWithUniqueItems {
 
   @JsonProperty("nullSet")
   @Valid
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 73241ece58af..32dc0c3fd933 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 8ccdac40b273..b030575ce32b 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 a191e434268c..a0be618b483c 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b319600c9510..5f1460876f73 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 989f88c0c63d..0b50eae96233 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 32e7a118e940..8777da8266d9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 a9f074c13f65..3d723f313ba1 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 fcf049c6af9c..8be627cf95e1 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
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
index 2105a8a42938..eef2ae958def 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
@@ -29,10 +32,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index aecbda603cb5..8eb8b8652c97 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 194acd76a434..c5b92b31b9da 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
index 8e8b948cac22..526bd764d159 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 4f3be6ed2259..48ef9800a85c 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,8 +24,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
index dd13d7bdec4e..9eee7b140851 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
index 57505b24226d..f2cd4ce28cfb 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 b8976cec9e36..dcb4bbe9aec8 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -20,8 +24,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
index f08bec554e28..649703382e4b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
index 96a6580d410a..84d42b07658e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
index 45154ca12c1d..2666fe6a16d3 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
index fce7506b0322..a877f6b3ecc2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 204603129979..b445b1b20647 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -20,8 +23,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
index e752d7d851f7..6e9cc3f76c8f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
index 5c758075628f..6ec78baa1738 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
index 834d74556f35..7463264a7077 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
index 35dca542482f..3206bff29712 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
@@ -20,7 +20,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 77b8104b7a75..6b0d3744fd88 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
index 01d454756ee7..c985b0b1554f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,7 +27,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 3384df59d317..36d854ff06c0 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
index d23c0b96ca06..f766be885540 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0a91f59ff49b..04424f0024a1 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -26,7 +26,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
index 5167914f6fd7..fac227135b94 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
@@ -22,7 +22,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 19aae2715ecd..6efe7c8047f7 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
index e179538482eb..dc9eb8ae5255 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
index 8aa5465ad199..4622b115826f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -22,7 +22,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
index d0980783d75b..73c079cba91c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
@@ -20,7 +20,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
index f52e43c1dd84..33fadd6869b4 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
index 83e683e3d6ae..1ce3810c20df 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
index 50e684f86e5c..a590e26b3f1d 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
index db4c1ce0513c..72dff4a24508 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 6d313020ae9c..c09e0076810e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
index cbb43d463caf..06b722ccf5f2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
index 5c803770a210..6ccb99b1e73e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index ac0dd3265f79..675a2453ad16 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
index b13b6e0d1d14..a342162fcc30 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
index cd278220668f..e5180de1584e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
@@ -19,7 +19,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
index cd6bf2b1a1d5..98a5e28e4dc9 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
index df5670691ce8..798ec01a7fbe 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +31,11 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..c512b2f15914 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Cat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
index d330c28e6791..f8fa05d91c38 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
index df5670691ce8..798ec01a7fbe 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +31,11 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..c512b2f15914 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Cat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
index d330c28e6791..f8fa05d91c38 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
index df5670691ce8..798ec01a7fbe 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +31,11 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..c512b2f15914 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Cat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
index d330c28e6791..f8fa05d91c38 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
index df5670691ce8..798ec01a7fbe 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -29,10 +31,11 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..c512b2f15914 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Cat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index d330c28e6791..f8fa05d91c38 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -25,7 +25,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 68a00f5edd47..12019bba5e82 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9fb7bfef1800..2bf0cfd302c2 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 3ee8ac596893..ae6abe025998 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 7a9d204bd401..e52378f1b2c6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a286c969cdc4..5f3fe5acdaa2 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 b379ee89c6c7..7cfb5cd2c28a 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
index e88acdf73662..9374367c38ec 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 72f7d357b895..a5a216a1d730 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 d6ee16b057d3..cb0d402383a6 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 bc35d0c6c349..352f0237ed84 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 afe4036afffd..7532c143b237 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
index ab02ea87cac1..52aa92684467 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.virtualan.model.BigCat;
+import org.openapitools.virtualan.model.Cat;
+import org.openapitools.virtualan.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
index 15759a42b451..180ab0ac0e8e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
index d2cd808c864f..ae14568d9905 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
index 3d8904d1860d..f9590f781517 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
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 21f41931c652..d9bf8904dc81 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
index 7d2355fb949b..166413f2de55 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
index c8b98732c14f..62a71dc052da 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
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 9575c51db521..e9f0eadb4b3e 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
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.virtualan.model.Animal;
+import org.openapitools.virtualan.model.BigCat;
 import org.openapitools.virtualan.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
index 025246cd689d..b9ad68564a95 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
index 89b1e16c9568..9aae0a86ca01 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
index e2fbb4c84841..4dd9879b6c3b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
index 0d17cf36c362..ab8ec390470b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
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 ad083982b12c..555bc9c9ac72 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
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.virtualan.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
index dfbf7374c3fe..94713cff834a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
index fc07498099ec..306c77d520f3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
index 94ee20413420..a60c2f44ef2f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
index a10d9cf3cbaf..42e3ae11c2eb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
index 1bdf0037dbb1..03e3f3072bda 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
index 3427304f7f0b..12ff058826ca 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
index 3bb737c56a4f..ff3467d8d833 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
index 8668bdd52295..cb6c1af6871b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d3062bf298a2..c318416d82ce 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
index c4899656a3d7..e614464af0ee 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
index d52a1a1e618c..2825787f2d1a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
index 4eea940f3318..6228ffaa9261 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
index 9ee87c9e5d1e..b2bf3b211999 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
index ca925033ab9b..ee68073ee601 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
index ec8823c6d1d0..3e818137fbbc 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
index f87bbe4c5b63..fd488c078afb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
index 6fa8aa39a0b0..39315b1a0023 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
index d5f7277f3364..7cc1fa816964 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
index 945a44bdc55e..b19436af3603 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
index 2405d307859d..d5b7c54fe44b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
index ba86da8547fc..83db384b15e3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
index ac1bbc674047..074a578f83f9 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
index 21ceeea10b87..6b7e94285b29 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
index 14aeefb90b47..d497e1b7525a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
index 01e81e5fdc63..782f3d60bcc5 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;
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 ea719cc4ad89..8e4c17989762 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
   @JsonProperty("name")
   private String name;
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 a4ec39252ebe..27a8f01607f1 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List>  {
+public class AdditionalPropertiesArray extends HashMap<String, List> {
 
   @JsonProperty("name")
   private String name;
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 47db34f7b504..bc7b87d760a9 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5851aa2c2498..b5e88d5d7ccb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
 
   @JsonProperty("map_string")
   @Valid
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 bba3dce1a55e..00b5174e93b7 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
   @JsonProperty("name")
   private String name;
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 5f48487e05d6..8fec423ffb1b 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
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
   @JsonProperty("name")
   private String name;
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 40ca1af6ab4f..67033332b0d6 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
   @JsonProperty("name")
   private String name;
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 ddc76e27b19f..993f83bb2cc1 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
@@ -22,7 +22,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String>  {
+public class AdditionalPropertiesString extends HashMap<String, String> {
 
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
index cb74cd4f746b..e11ae425d9e9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.BigCat;
+import org.openapitools.model.Cat;
+import org.openapitools.model.Dog;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -30,10 +33,11 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog")
 })
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Animal   {
+public class Animal {
 
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3859dcfdcc05..df67eda87fd1 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
 
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a90ce117c238..05f1ca376a68 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
 
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
index e8f37b16d5cb..ba67885edc8a 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ArrayTest   {
+public class ArrayTest {
 
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
index 68a00f5edd47..12019bba5e82 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +25,9 @@
  * BigCat
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCat extends Cat  {
+public class BigCat extends Cat {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
index 23fd197e0faa..35ae937c0009 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -23,7 +23,7 @@
 
 @JsonTypeName("BigCat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class BigCatAllOf   {
+public class BigCatAllOf {
 
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
index 37c928a79482..e9cce9de0115 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Capitalization   {
+public class Capitalization {
 
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
index 9fb7bfef1800..2bf0cfd302c2 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
+import org.openapitools.model.BigCat;
 import org.openapitools.model.CatAllOf;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
@@ -21,8 +25,17 @@
  * Cat
  */
 
+@JsonIgnoreProperties(
+  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the className to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat")
+})
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Cat extends Animal  {
+public class Cat extends Animal {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
index 7f699ced5842..eed74bea751a 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Cat_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class CatAllOf   {
+public class CatAllOf {
 
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
index 8adf35c2fa00..27a4a9f25665 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
+public class Category {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
index 72e9288b53af..69296da7e60e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ClassModel   {
+public class ClassModel {
 
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
index 9891fe7dafce..b788daea14a3 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Client   {
+public class Client {
 
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
index 3ee8ac596893..ae6abe025998 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
@@ -2,8 +2,11 @@
 
 import java.net.URI;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
@@ -21,8 +24,9 @@
  * Dog
  */
 
+
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Dog extends Animal  {
+public class Dog extends Animal {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
index c081b7517a47..4f275e535333 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("Dog_allOf")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class DogAllOf   {
+public class DogAllOf {
 
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
index b85ad3e155ec..dba32cf2b710 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumArrays   {
+public class EnumArrays {
 
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
index ba5b8c323a9a..c20bc1460143 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
@@ -24,7 +24,7 @@
 
 @JsonTypeName("Enum_Test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class EnumTest   {
+public class EnumTest {
 
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java
index 685394664974..d82e4902623d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Must be named `File` for test.")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class File   {
+public class File {
 
   @JsonProperty("sourceURI")
   private String sourceURI;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 01149ce8f6ae..2ea153bd6468 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FileSchemaTestClass   {
+public class FileSchemaTestClass {
 
   @JsonProperty("file")
   private File file;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
index 153641cacd56..0e2aeaa78a22 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 @JsonTypeName("format_test")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class FormatTest   {
+public class FormatTest {
 
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d235c68a51ff..224b16d1a2d3 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("hasOnlyReadOnly")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
index 27e3cea8e6ed..af19fe2f67f6 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MapTest   {
+public class MapTest {
 
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e490e2a61ef7..84e970dc308e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,7 +27,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
 
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
index 56b222f4e45b..36dfd34883e8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing model name starting with number")
 @JsonTypeName("200_response")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Model200Response   {
+public class Model200Response {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
index 131e671e9160..dfba6cb672d4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("ApiResponse")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
+public class ModelApiResponse {
 
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java
index 7800a7d698f7..97ddf5359aa0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("List")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelList   {
+public class ModelList {
 
   @JsonProperty("123-list")
   private String _123list;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
index a933badc4910..4505ddfeeeca 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
@@ -23,7 +23,7 @@
 @ApiModel(description = "Model for testing reserved words")
 @JsonTypeName("Return")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelReturn   {
+public class ModelReturn {
 
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
index febe2115a665..51cc37bbeea7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
@@ -21,7 +21,7 @@
 
 @ApiModel(description = "Model for testing model name same as property name")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Name   {
+public class Name {
 
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
index dcf5c5e801a6..278146bfb899 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class NumberOnly   {
+public class NumberOnly {
 
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
index 6bd55e5a1548..9a9ed4f6c960 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
+public class Order {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
index eca5e7cd4fa5..c1a709bb26ad 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
@@ -21,7 +21,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class OuterComposite   {
+public class OuterComposite {
 
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index 9f17ad305dae..4d705acedcd2 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -28,7 +28,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
+public class Pet {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e2ddfcdfcb17..b7a0a416782e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
 
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
index cbc94826b926..f321ab78cd56 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -22,7 +22,7 @@
 
 @JsonTypeName("$special[model.name]")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class SpecialModelName   {
+public class SpecialModelName {
 
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
index 03b4ffcdadca..6161be4a9229 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
+public class Tag {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 01e5d5f3fccd..f10cff73bb78 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderDefault   {
+public class TypeHolderDefault {
 
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
index e907ad9c28e7..d2ae69a4e5a8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class TypeHolderExample   {
+public class TypeHolderExample {
 
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
index cff62427bf1a..ec85459bc99a 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
@@ -20,7 +20,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
+public class User {
 
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
index 930edebcef74..27d5f8282818 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,7 +23,7 @@
  */
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class XmlItem   {
+public class XmlItem {
 
   @JsonProperty("attribute_string")
   private String attributeString;