From 1ed3758a7a533c8f7e026acf5be76ed9fcd5aee8 Mon Sep 17 00:00:00 2001
From: Pascal Bachor <bachorp@users.noreply.github.com>
Date: Thu, 29 May 2025 19:06:30 +0000
Subject: [PATCH 1/2] Bump jmustache

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b04e82e4cb9..5fc6707b4c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1228,7 +1228,7 @@
         <jackson-threetenbp.version>2.18.2</jackson-threetenbp.version>
         <jackson.version>2.18.2</jackson.version>
         <jacoco.version>0.8.12</jacoco.version>
-        <jmustache.version>1.15</jmustache.version>
+        <jmustache.version>1.16</jmustache.version>
         <junit.version>5.10.2</junit.version>
         <kotlin.version>1.6.21</kotlin.version>
         <kotlin-compiler-embeddable.version>1.6.21</kotlin-compiler-embeddable.version>

From 7451c61f9b002369f17f5842ab12d13a55c995c5 Mon Sep 17 00:00:00 2001
From: Pascal Bachor <bachorp@users.noreply.github.com>
Date: Wed, 2 Jul 2025 16:32:50 +0000
Subject: [PATCH 2/2] adjust templates to updated jmustache semantics

---
 .../main/resources/Java/ApiClient.mustache    |  1 +
 .../resources/Java/Configuration.mustache     |  1 +
 .../resources/Java/JavaTimeFormatter.mustache |  1 +
 .../src/main/resources/Java/Pair.mustache     |  1 +
 .../resources/Java/RFC3339DateFormat.mustache |  1 +
 .../Java/RFC3339InstantDeserializer.mustache  |  1 +
 .../Java/RFC3339JavaTimeModule.mustache       |  1 +
 .../Java/ServerConfiguration.mustache         |  1 +
 .../resources/Java/ServerVariable.mustache    |  1 +
 .../main/resources/Java/StringUtil.mustache   |  1 +
 .../src/main/resources/Java/api.mustache      |  1 +
 .../main/resources/Java/apiException.mustache |  1 +
 .../resources/Java/auth/ApiKeyAuth.mustache   |  1 +
 .../Java/auth/Authentication.mustache         |  1 +
 .../Java/auth/HttpBasicAuth.mustache          |  1 +
 .../Java/auth/HttpBearerAuth.mustache         |  1 +
 .../main/resources/Java/auth/OAuth.mustache   |  1 +
 .../resources/Java/auth/OAuthFlow.mustache    |  1 +
 .../apache-httpclient/ApiClient.mustache      |  1 +
 .../apache-httpclient/BaseApi.mustache        |  1 +
 .../libraries/apache-httpclient/api.mustache  |  1 +
 .../Java/libraries/feign/ApiClient.mustache   |  1 +
 .../Java/libraries/feign/api.mustache         |  1 +
 .../feign/auth/DefaultApi20Impl.mustache      |  1 +
 .../Java/libraries/feign/auth/OAuth.mustache  |  1 +
 .../auth/OauthClientCredentialsGrant.mustache |  1 +
 .../feign/auth/OauthPasswordGrant.mustache    |  1 +
 .../Java/libraries/feign/pojo.mustache        |  9 +++--
 .../google-api-client/ApiClient.mustache      |  1 +
 .../libraries/google-api-client/api.mustache  |  1 +
 .../jersey2/AbstractOpenApiSchema.mustache    |  2 ++
 .../Java/libraries/jersey2/ApiClient.mustache |  1 +
 .../Java/libraries/jersey2/JSON.mustache      |  1 +
 .../libraries/jersey2/anyof_model.mustache    |  1 +
 .../Java/libraries/jersey2/api.mustache       |  3 +-
 .../libraries/jersey2/apiException.mustache   |  1 +
 .../jersey2/auth/ApiKeyAuth.mustache          |  1 +
 .../jersey2/auth/Authentication.mustache      |  1 +
 .../jersey2/auth/HttpBasicAuth.mustache       |  1 +
 .../jersey2/auth/HttpBearerAuth.mustache      |  1 +
 .../libraries/jersey2/auth/OAuth.mustache     |  1 +
 .../Java/libraries/jersey2/model_doc.mustache |  4 +++
 .../libraries/jersey2/oneof_model.mustache    |  1 +
 .../Java/libraries/jersey2/pojo.mustache      |  9 +++--
 .../jersey3/AbstractOpenApiSchema.mustache    |  2 ++
 .../Java/libraries/jersey3/ApiClient.mustache |  1 +
 .../Java/libraries/jersey3/JSON.mustache      |  1 +
 .../libraries/jersey3/anyof_model.mustache    |  1 +
 .../Java/libraries/jersey3/api.mustache       |  3 +-
 .../libraries/jersey3/apiException.mustache   |  1 +
 .../jersey3/auth/ApiKeyAuth.mustache          |  1 +
 .../jersey3/auth/Authentication.mustache      |  1 +
 .../jersey3/auth/HttpBasicAuth.mustache       |  1 +
 .../jersey3/auth/HttpBearerAuth.mustache      |  1 +
 .../libraries/jersey3/auth/OAuth.mustache     |  1 +
 .../Java/libraries/jersey3/model_doc.mustache |  4 +++
 .../libraries/jersey3/oneof_model.mustache    |  1 +
 .../Java/libraries/jersey3/pojo.mustache      |  9 +++--
 .../libraries/microprofile/model.mustache     |  2 ++
 .../Java/libraries/microprofile/pojo.mustache |  3 ++
 .../native/AbstractOpenApiSchema.mustache     |  2 ++
 .../Java/libraries/native/ApiClient.mustache  |  1 +
 .../libraries/native/ApiResponse.mustache     |  1 +
 .../Java/libraries/native/JSON.mustache       |  3 +-
 .../libraries/native/anyof_model.mustache     |  1 +
 .../Java/libraries/native/api.mustache        |  9 ++---
 .../libraries/native/apiException.mustache    |  1 +
 .../Java/libraries/native/model_doc.mustache  |  4 +++
 .../libraries/native/oneof_model.mustache     |  1 +
 .../Java/libraries/native/pojo.mustache       | 11 ++++--
 .../AbstractOpenApiSchema.mustache            |  2 ++
 .../Java/libraries/okhttp-gson/api.mustache   |  4 +--
 .../okhttp-gson/apiException.mustache         |  1 +
 .../okhttp-gson/auth/AWS4Auth.mustache        |  1 +
 .../okhttp-gson/auth/ApiKeyAuth.mustache      |  1 +
 .../okhttp-gson/auth/Authentication.mustache  |  1 +
 .../okhttp-gson/auth/HttpBearerAuth.mustache  |  1 +
 .../libraries/okhttp-gson/auth/OAuth.mustache |  1 +
 .../Java/libraries/okhttp-gson/pojo.mustache  |  8 +++--
 .../libraries/restclient/ApiClient.mustache   |  1 +
 .../Java/libraries/restclient/api.mustache    |  1 +
 .../restclient/auth/ApiKeyAuth.mustache       |  1 +
 .../restclient/auth/Authentication.mustache   |  1 +
 .../restclient/auth/HttpBasicAuth.mustache    |  1 +
 .../restclient/auth/HttpBearerAuth.mustache   |  1 +
 .../libraries/restclient/auth/OAuth.mustache  |  1 +
 .../Java/libraries/restclient/pojo.mustache   | 11 ++++--
 .../libraries/resteasy/ApiClient.mustache     |  1 +
 .../Java/libraries/resteasy/JSON.mustache     |  1 +
 .../Java/libraries/resteasy/api.mustache      |  1 +
 .../libraries/resttemplate/ApiClient.mustache |  1 +
 .../libraries/resttemplate/BaseApi.mustache   |  1 +
 .../Java/libraries/resttemplate/api.mustache  |  1 +
 .../resttemplate/auth/ApiKeyAuth.mustache     |  1 +
 .../resttemplate/auth/Authentication.mustache |  1 +
 .../resttemplate/auth/HttpBasicAuth.mustache  |  1 +
 .../resttemplate/auth/HttpBearerAuth.mustache |  1 +
 .../resttemplate/auth/OAuth.mustache          |  1 +
 .../Java/libraries/resttemplate/pojo.mustache | 11 ++++--
 .../libraries/retrofit2/JSON_jackson.mustache |  1 +
 .../play-common/auth/ApiKeyAuth.mustache      |  1 +
 .../Java/libraries/vertx/ApiClient.mustache   |  1 +
 .../libraries/vertx/apiException.mustache     |  1 +
 .../Java/libraries/vertx/apiImpl.mustache     |  1 +
 .../libraries/vertx/auth/ApiKeyAuth.mustache  |  1 +
 .../vertx/auth/Authentication.mustache        |  1 +
 .../vertx/auth/HttpBasicAuth.mustache         |  1 +
 .../vertx/auth/HttpBearerAuth.mustache        |  1 +
 .../Java/libraries/vertx/auth/OAuth.mustache  |  1 +
 .../Java/libraries/vertx/rxApiImpl.mustache   |  1 +
 .../libraries/webclient/ApiClient.mustache    |  1 +
 .../Java/libraries/webclient/api.mustache     |  1 +
 .../webclient/auth/ApiKeyAuth.mustache        |  1 +
 .../webclient/auth/Authentication.mustache    |  1 +
 .../webclient/auth/HttpBasicAuth.mustache     |  1 +
 .../webclient/auth/HttpBearerAuth.mustache    |  1 +
 .../libraries/webclient/auth/OAuth.mustache   |  1 +
 .../Java/libraries/webclient/pojo.mustache    | 11 ++++--
 .../src/main/resources/Java/pojo.mustache     | 10 ++++--
 .../JavaInflector/StringUtil.mustache         |  1 +
 .../main/resources/JavaInflector/api.mustache |  1 +
 .../resources/JavaInflector/pojo.mustache     |  2 ++
 .../resources/JavaJaxRS/ApiException.mustache |  1 +
 .../JavaJaxRS/ApiOriginFilter.mustache        |  1 +
 .../JavaJaxRS/ApiResponseMessage.mustache     |  1 +
 .../JavaJaxRS/NotFoundException.mustache      |  1 +
 .../resources/JavaJaxRS/StringUtil.mustache   |  1 +
 .../src/main/resources/JavaJaxRS/api.mustache |  1 +
 .../resources/JavaJaxRS/apiService.mustache   |  1 +
 .../JavaJaxRS/apiServiceFactory.mustache      |  1 +
 .../JavaJaxRS/apiServiceImpl.mustache         |  1 +
 .../resources/JavaJaxRS/cxf-cdi/api.mustache  |  1 +
 .../JavaJaxRS/cxf-cdi/apiService.mustache     |  1 +
 .../JavaJaxRS/cxf-cdi/apiServiceImpl.mustache |  1 +
 .../JavaJaxRS/cxf-cdi/enumOuterClass.mustache |  1 +
 .../JavaJaxRS/cxf-ext/model.mustache          |  2 ++
 .../resources/JavaJaxRS/cxf/model.mustache    |  2 ++
 .../JavaJaxRS/libraries/jersey3/api.mustache  |  1 +
 .../JavaJaxRS/libraries/jersey3/pojo.mustache |  2 ++
 .../main/resources/JavaJaxRS/pojo.mustache    |  2 ++
 .../JavaJaxRS/resteasy/ApiException.mustache  |  1 +
 .../resteasy/ApiOriginFilter.mustache         |  1 +
 .../resteasy/ApiResponseMessage.mustache      |  1 +
 .../resteasy/NotFoundException.mustache       |  1 +
 .../JavaJaxRS/resteasy/StringUtil.mustache    |  1 +
 .../resources/JavaJaxRS/resteasy/api.mustache |  1 +
 .../JavaJaxRS/resteasy/apiService.mustache    |  1 +
 .../resteasy/apiServiceImpl.mustache          |  1 +
 .../JavaJaxRS/resteasy/eap/api.mustache       |  1 +
 .../resteasy/eap/apiServiceImpl.mustache      |  1 +
 .../JavaJaxRS/resteasy/eap/model.mustache     |  2 ++
 .../JavaJaxRS/resteasy/model.mustache         |  2 ++
 .../resources/JavaJaxRS/spec/api.mustache     |  1 +
 .../spec/libraries/quarkus/api.mustache       |  1 +
 .../resources/JavaJaxRS/spec/model.mustache   |  1 +
 .../resources/JavaJaxRS/spec/pojo.mustache    |  4 +--
 .../JavaPlayFramework/model.mustache          |  2 ++
 .../JavaPlayFramework/newApi.mustache         |  1 +
 .../newApiController.mustache                 |  3 +-
 .../newApiInterface.mustache                  |  1 +
 .../resources/JavaPlayFramework/pojo.mustache |  6 ++--
 .../main/resources/JavaSpring/api.mustache    |  3 +-
 .../JavaSpring/apiController.mustache         |  5 +--
 .../resources/JavaSpring/apiDelegate.mustache |  3 +-
 .../JavaSpring/apiException.mustache          |  1 +
 .../JavaSpring/apiOriginFilter.mustache       |  1 +
 .../JavaSpring/apiResponseMessage.mustache    |  1 +
 .../JavaSpring/enumOuterClass.mustache        |  2 ++
 .../spring-http-interface/api.mustache        |  1 +
 .../main/resources/JavaSpring/model.mustache  |  1 +
 .../JavaSpring/notFoundException.mustache     |  1 +
 .../JavaSpring/oneof_interface.mustache       |  3 ++
 .../openapiDocumentationConfig.mustache       |  1 +
 .../main/resources/JavaSpring/pojo.mustache   | 11 ++++--
 .../resources/JavaVertXServer/api.mustache    |  2 ++
 .../JavaVertXServer/apiVerticle.mustache      |  2 ++
 .../partial_model_generic.mustache            |  2 ++
 .../Javascript-Flowtyped/api.mustache         |  1 +
 .../configuration.mustache                    |  1 +
 .../Javascript-Flowtyped/index.mustache       |  1 +
 .../main/resources/Javascript/model.mustache  |  3 ++
 .../Javascript/partial_model_generic.mustache |  2 ++
 .../src/main/resources/apex/pojo.mustache     |  2 ++
 .../asciidoc-documentation/index.mustache     |  2 ++
 .../asciidoc-documentation/params.mustache    |  5 +++
 .../resources/aspnetcore/2.0/model.mustache   |  2 ++
 .../resources/aspnetcore/2.1/model.mustache   |  2 ++
 .../resources/aspnetcore/3.0/model.mustache   |  2 ++
 .../cpp-pistache-server/model-source.mustache |  4 +--
 .../model-struct-source.mustache              |  4 +--
 .../cpp-restbed-server/api-source.mustache    |  4 +--
 .../crystal/configuration_spec.mustache       |  1 +
 .../src/main/resources/crystal/model.mustache |  3 ++
 .../main/resources/crystal/model_doc.mustache |  2 ++
 .../crystal/partial_model_generic.mustache    |  1 +
 .../resources/csharp-functions/model.mustache |  2 ++
 .../csharp-functions/modelGeneric.mustache    |  2 ++
 .../generichost/ApiException.mustache         |  1 +
 .../generichost/ApiResponse`1.mustache        |  1 +
 .../generichost/ApiTestsBase.mustache         |  1 +
 .../DateOnlyJsonConverter.mustache            |  1 +
 .../DateOnlyNullableJsonConverter.mustache    |  1 +
 .../DateTimeJsonConverter.mustache            |  1 +
 .../DateTimeNullableJsonConverter.mustache    |  1 +
 .../HttpSigningConfiguration.mustache         |  1 +
 .../generichost/JsonConverter.mustache        | 14 ++++----
 .../libraries/generichost/Option.mustache     |  1 +
 .../generichost/RateLimitProvider`1.mustache  |  1 +
 .../generichost/TokenProvider`1.mustache      |  1 +
 .../generichost/WriteProperty.mustache        |  3 +-
 .../csharp/libraries/generichost/api.mustache |  7 ++--
 .../libraries/generichost/api_test.mustache   |  1 +
 .../libraries/generichost/model.mustache      |  5 +++
 .../generichost/modelGeneric.mustache         |  3 ++
 .../resources/csharp/modelGeneric.mustache    |  3 ++
 .../resources/csharp/validatable.mustache     |  6 ++--
 .../serialization/built_value/class.mustache  |  2 ++
 .../built_value/class_inline_enums.mustache   |  2 ++
 .../json_serializable/class.mustache          |  3 ++
 .../src/main/resources/dart2/api.mustache     |  1 +
 .../main/resources/dart2/api_client.mustache  |  1 +
 .../resources/dart2/api_exception.mustache    |  1 +
 .../main/resources/dart2/api_helper.mustache  |  1 +
 .../dart2/auth/api_key_auth.mustache          |  1 +
 .../dart2/auth/authentication.mustache        |  1 +
 .../dart2/auth/http_basic_auth.mustache       |  1 +
 .../dart2/auth/http_bearer_auth.mustache      |  1 +
 .../main/resources/dart2/auth/oauth.mustache  |  1 +
 .../src/main/resources/dart2/model.mustache   |  3 ++
 .../native/native_class.mustache              |  3 ++
 .../src/main/resources/elm/operation.mustache |  2 ++
 .../main/resources/elm/recordDecoder.mustache |  1 +
 .../main/resources/elm/recordEncoder.mustache |  1 +
 .../src/main/resources/go/model.mustache      |  1 +
 .../main/resources/go/model_anyof.mustache    |  1 +
 .../main/resources/go/model_oneof.mustache    |  1 +
 .../main/resources/go/model_simple.mustache   |  1 +
 .../model.mustache                            |  1 +
 .../resources/graphql-schema/model.mustache   |  1 +
 .../main/resources/htmlDocs/index.mustache    |  2 +-
 .../main/resources/htmlDocs2/index.mustache   | 36 +++++++++----------
 .../resources/java-camel-server/pojo.mustache | 11 ++++--
 .../libraries/mp/JavaTimeFormatter.mustache   |  1 +
 .../client/libraries/mp/StringUtil.mustache   |  1 +
 .../libraries/mp/auth/ApiKeyAuth.mustache     |  1 +
 .../libraries/mp/auth/HttpBasicAuth.mustache  |  1 +
 .../libraries/mp/auth/HttpBearerAuth.mustache |  1 +
 .../client/libraries/mp/model.mustache        |  2 ++
 .../client/libraries/mp/pojo.mustache         |  1 +
 .../libraries/se/JavaTimeFormatter.mustache   |  1 +
 .../client/libraries/se/StringUtil.mustache   |  1 +
 .../client/libraries/se/model.mustache        |  2 ++
 .../client/libraries/se/pojo.mustache         |  1 +
 .../java-helidon/common/model.mustache        |  2 ++
 .../java-helidon/common/pojo.mustache         |  2 ++
 .../libraries/mp/JavaTimeFormatter.mustache   |  1 +
 .../server/libraries/mp/StringUtil.mustache   |  1 +
 .../server/libraries/mp/api.mustache          |  2 ++
 .../server/libraries/mp/apiImpl.mustache      |  2 ++
 .../server/libraries/mp/model.mustache        |  2 ++
 .../server/libraries/mp/pojo.mustache         |  1 +
 .../server/libraries/se/api.mustache          |  1 +
 .../server/libraries/se/pojo.mustache         |  2 ++
 .../java-micronaut/client/api.mustache        |  1 +
 .../client/auth/Authorization.mustache        |  1 +
 .../client/auth/AuthorizationBinder.mustache  |  1 +
 .../client/auth/AuthorizationFilter.mustache  |  1 +
 .../client/auth/Authorizations.mustache       |  1 +
 .../ApiKeyAuthConfiguration.mustache          |  1 +
 .../ConfigurableAuthorization.mustache        |  1 +
 .../HttpBasicAuthConfiguration.mustache       |  1 +
 .../common/model/model.mustache               |  3 ++
 .../java-micronaut/common/model/pojo.mustache |  3 ++
 .../java-micronaut/server/controller.mustache |  3 +-
 .../java-msf4j-server/ApiException.mustache   |  1 +
 .../ApiOriginFilter.mustache                  |  1 +
 .../ApiResponseMessage.mustache               |  1 +
 .../NotFoundException.mustache                |  1 +
 .../java-msf4j-server/StringUtil.mustache     |  1 +
 .../resources/java-msf4j-server/api.mustache  |  1 +
 .../java-msf4j-server/apiService.mustache     |  1 +
 .../java-msf4j-server/apiServiceImpl.mustache |  1 +
 .../java-msf4j-server/model.mustache          |  2 ++
 .../resources/java-msf4j-server/pojo.mustache |  2 ++
 .../main/resources/java-pkmst/api.mustache    |  1 +
 .../java-pkmst/apiController.mustache         |  1 +
 .../java-pkmst/beanValidation.mustache        |  1 +
 .../main/resources/java-pkmst/model.mustache  |  2 ++
 .../java-pkmst/notFoundException.mustache     |  1 +
 .../main/resources/java-pkmst/pojo.mustache   |  2 ++
 .../resources/julia-client/model.mustache     |  5 +++
 .../resources/julia-client/model_doc.mustache |  2 ++
 .../resources/julia-server/model.mustache     |  5 +++
 .../resources/julia-server/model_doc.mustache |  2 ++
 .../kotlin-client/anyof_class.mustache        |  1 +
 .../kotlin-client/data_class.mustache         |  1 +
 .../jvm-volley/auth/authentication.mustache   |  2 ++
 .../request/RequestFactory.mustache           |  2 +-
 .../libraries/multiplatform/api.mustache      |  2 ++
 .../kotlin-client/oneof_class.mustache        |  1 +
 .../libraries/jaxrs-spec/api.mustache         |  1 +
 .../libraries/jaxrs-spec/data_class.mustache  |  1 +
 .../libraries/jaxrs-spec/enum_class.mustache  |  1 +
 .../libraries/ktor/_api_body.mustache         |  2 ++
 .../libraries/ktor2/_api_body.mustache        |  2 ++
 .../kotlin-spring/apiController.mustache      |  1 +
 .../kotlin-spring/apiDelegate.mustache        |  3 +-
 .../kotlin-spring/dataClass.mustache          |  4 +--
 .../springfoxDocumentationConfig.mustache     |  1 +
 .../ktorm-schema/data_class.mustache          |  1 +
 .../src/main/resources/lua/model.mustache     |  1 +
 .../resources/objc/ApiClient-header.mustache  |  1 +
 .../objc/Configuration-protocol.mustache      |  1 +
 .../objc/DefaultConfiguration-header.mustache |  1 +
 .../JSONRequestSerializer-header.mustache     |  1 +
 ...ONValueTransformer+ISO8601-header.mustache |  1 +
 .../resources/objc/Logger-header.mustache     |  1 +
 .../objc/NSManagedObject-header.mustache      |  1 +
 .../NSManagedObjectBuilder-header.mustache    |  1 +
 .../resources/objc/Object-header.mustache     |  1 +
 .../objc/QueryParamCollection-header.mustache |  1 +
 .../objc/ResponseDeserializer-header.mustache |  1 +
 .../resources/objc/Sanitizer-header.mustache  |  1 +
 .../main/resources/objc/api-header.mustache   |  1 +
 .../main/resources/objc/api-protocol.mustache |  1 +
 .../main/resources/objc/model-header.mustache |  1 +
 .../src/main/resources/perl/object.mustache   |  1 +
 .../main/resources/php-flight/api.mustache    |  1 +
 .../main/resources/php-flight/model.mustache  |  1 +
 .../php-flight/register_routes.mustache       |  1 +
 .../php-flight/register_routes_test.mustache  |  1 +
 .../php-laravel/api_controller.mustache       |  2 +-
 .../main/resources/php-laravel/model.mustache |  2 ++
 .../php-lumen/AppServiceProvider.php.mustache |  1 +
 .../AuthServiceProvider.php.mustache          |  1 +
 .../php-lumen/Authenticate.php.mustache       |  1 +
 .../php-lumen/Controller.php.mustache         |  1 +
 .../php-lumen/DatabaseSeeder.php.mustache     |  1 +
 .../resources/php-lumen/Event.php.mustache    |  1 +
 .../EventServiceProvider.php.mustache         |  1 +
 .../php-lumen/ExampleController.php.mustache  |  1 +
 .../php-lumen/ExampleEvent.php.mustache       |  1 +
 .../php-lumen/ExampleJob.php.mustache         |  1 +
 .../php-lumen/ExampleListener.php.mustache    |  1 +
 .../php-lumen/ExampleMiddleware.php.mustache  |  1 +
 .../php-lumen/ExampleTest.php.mustache        |  1 +
 .../resources/php-lumen/Handler.php.mustache  |  1 +
 .../main/resources/php-lumen/Job.php.mustache |  1 +
 .../resources/php-lumen/Kernel.php.mustache   |  1 +
 .../php-lumen/ModelFactory.php.mustache       |  1 +
 .../resources/php-lumen/TestCase.php.mustache |  1 +
 .../resources/php-lumen/User.php.mustache     |  1 +
 .../src/main/resources/php-lumen/api.mustache |  1 +
 .../main/resources/php-lumen/app.php.mustache |  1 +
 .../main/resources/php-lumen/artisan.mustache |  1 +
 .../resources/php-lumen/index.php.mustache    |  1 +
 .../main/resources/php-lumen/routes.mustache  |  2 ++
 .../php-nextgen/ApiException.mustache         |  1 +
 .../php-nextgen/Configuration.mustache        |  1 +
 .../php-nextgen/FormDataProcessor.mustache    |  1 +
 .../php-nextgen/HeaderSelector.mustache       |  1 +
 .../php-nextgen/ModelInterface.mustache       |  1 +
 .../php-nextgen/ObjectSerializer.mustache     |  1 +
 .../resources/php-nextgen/README.mustache     |  1 +
 .../main/resources/php-nextgen/api.mustache   |  1 +
 .../resources/php-nextgen/api_doc.mustache    |  1 +
 .../resources/php-nextgen/api_test.mustache   |  1 +
 .../main/resources/php-nextgen/model.mustache |  1 +
 .../resources/php-nextgen/model_test.mustache |  1 +
 .../abstract_authenticator.mustache           |  1 +
 .../resources/php-slim4-server/api.mustache   |  1 +
 .../php-slim4-server/api_test.mustache        |  1 +
 .../php-slim4-server/base_model.mustache      |  1 +
 .../php-slim4-server/base_model_test.mustache |  1 +
 .../resources/php-slim4-server/index.mustache |  1 +
 .../resources/php-slim4-server/model.mustache |  1 +
 .../php-slim4-server/model_test.mustache      |  1 +
 .../register_dependencies.mustache            |  1 +
 .../register_middlewares.mustache             |  1 +
 .../php-slim4-server/register_routes.mustache |  1 +
 .../response_emitter.mustache                 |  1 +
 .../resources/php-symfony/ApiPass.mustache    |  1 +
 .../resources/php-symfony/ApiServer.mustache  |  1 +
 .../resources/php-symfony/Bundle.mustache     |  1 +
 .../resources/php-symfony/Controller.mustache |  1 +
 .../resources/php-symfony/Extension.mustache  |  1 +
 .../main/resources/php-symfony/api.mustache   |  1 +
 .../php-symfony/api_controller.mustache       |  2 ++
 .../resources/php-symfony/autoload.mustache   |  1 +
 .../main/resources/php-symfony/model.mustache |  1 +
 .../testing/ControllerTest.mustache           |  1 +
 .../php-symfony/testing/api_test.mustache     |  1 +
 .../php-symfony/testing/model_test.mustache   |  1 +
 .../main/resources/php/ApiException.mustache  |  1 +
 .../main/resources/php/Configuration.mustache |  1 +
 .../resources/php/FormDataProcessor.mustache  |  1 +
 .../resources/php/HeaderSelector.mustache     |  1 +
 .../resources/php/ModelInterface.mustache     |  1 +
 .../resources/php/ObjectSerializer.mustache   |  1 +
 .../src/main/resources/php/README.mustache    |  1 +
 .../src/main/resources/php/api.mustache       |  1 +
 .../src/main/resources/php/api_doc.mustache   |  1 +
 .../src/main/resources/php/api_test.mustache  |  1 +
 .../libraries/psr-18/ApiException.mustache    |  1 +
 .../php/libraries/psr-18/DebugPlugin.mustache |  1 +
 .../php/libraries/psr-18/README.mustache      |  1 +
 .../php/libraries/psr-18/api.mustache         |  1 +
 .../php/libraries/psr-18/api_doc.mustache     |  1 +
 .../src/main/resources/php/model.mustache     |  1 +
 .../main/resources/php/model_test.mustache    |  1 +
 .../main/resources/powershell/model.mustache  |  1 +
 .../resources/python-fastapi/main.mustache    |  1 +
 .../resources/python-fastapi/model.mustache   |  2 ++
 .../python-fastapi/model_test.mustache        |  1 +
 .../python-pydantic-v1/README.mustache        |  1 +
 .../README_onlypackage.mustache               |  1 +
 .../python-pydantic-v1/__init__model.mustache |  1 +
 .../__init__package.mustache                  |  1 +
 .../resources/python-pydantic-v1/api.mustache |  1 +
 .../python-pydantic-v1/api_client.mustache    |  1 +
 .../python-pydantic-v1/api_doc.mustache       |  1 +
 .../api_doc_example.mustache                  |  1 +
 .../python-pydantic-v1/api_test.mustache      |  1 +
 .../python-pydantic-v1/asyncio/rest.mustache  |  1 +
 .../python-pydantic-v1/common_README.mustache |  1 +
 .../python-pydantic-v1/configuration.mustache |  1 +
 .../python-pydantic-v1/exceptions.mustache    |  1 +
 .../python-pydantic-v1/model.mustache         |  2 ++
 .../python-pydantic-v1/model_test.mustache    |  1 +
 .../python-pydantic-v1/rest.mustache          |  1 +
 .../python-pydantic-v1/setup.mustache         |  1 +
 .../python-pydantic-v1/tornado/rest.mustache  |  1 +
 .../src/main/resources/python/README.mustache |  1 +
 .../python/README_onlypackage.mustache        |  1 +
 .../resources/python/__init__model.mustache   |  1 +
 .../resources/python/__init__package.mustache |  1 +
 .../src/main/resources/python/api.mustache    |  4 +++
 .../main/resources/python/api_client.mustache |  1 +
 .../main/resources/python/api_doc.mustache    |  1 +
 .../resources/python/api_doc_example.mustache |  1 +
 .../main/resources/python/api_test.mustache   |  1 +
 .../resources/python/asyncio/rest.mustache    |  1 +
 .../resources/python/common_README.mustache   |  1 +
 .../resources/python/configuration.mustache   |  1 +
 .../main/resources/python/exceptions.mustache |  1 +
 .../src/main/resources/python/model.mustache  |  2 ++
 .../main/resources/python/model_test.mustache |  1 +
 .../src/main/resources/python/rest.mustache   |  1 +
 .../src/main/resources/python/setup.mustache  |  1 +
 .../resources/python/tornado/rest.mustache    |  1 +
 .../main/resources/ruby-client/api.mustache   |  1 +
 .../resources/ruby-client/api_client.mustache |  4 +++
 .../resources/ruby-client/api_error.mustache  |  1 +
 .../resources/ruby-client/api_test.mustache   |  1 +
 .../ruby-client/configuration.mustache        |  4 +++
 .../main/resources/ruby-client/gem.mustache   |  1 +
 .../resources/ruby-client/gemspec.mustache    |  1 +
 .../main/resources/ruby-client/model.mustache |  5 +++
 .../resources/ruby-client/model_doc.mustache  |  2 ++
 .../resources/ruby-client/model_test.mustache |  1 +
 .../partial_model_generic.mustache            |  1 +
 .../ruby-client/spec_helper.mustache          |  1 +
 .../resources/ruby-client/version.mustache    |  1 +
 .../ruby-on-rails-server/controller.mustache  |  1 +
 .../ruby-on-rails-server/migrate.mustache     |  1 +
 .../ruby-on-rails-server/model.mustache       |  1 +
 .../ruby-on-rails-server/routes.mustache      |  1 +
 .../main/resources/rust-axum/apis.mustache    |  1 +
 .../resources/rust-axum/server-mod.mustache   |  3 ++
 .../rust-server/client-callbacks.mustache     |  5 +++
 .../resources/rust-server/client-mod.mustache |  1 +
 .../rust-server/client-operation.mustache     |  2 ++
 .../client-request-body-instance.mustache     |  2 ++
 .../example-client-server.mustache            |  1 +
 .../example-server-server.mustache            |  1 +
 .../main/resources/rust-server/lib.mustache   |  2 ++
 .../rust-server/server-callbacks.mustache     |  1 +
 .../resources/rust-server/server-mod.mustache |  5 +++
 .../rust-server/server-operation.mustache     |  2 ++
 .../server-request-body-instance.mustache     |  4 +++
 .../server-response-body-instance.mustache    |  1 +
 .../resources/scala-akka-client/api.mustache  |  1 +
 .../scala-akka-client/model_doc.mustache      |  2 ++
 .../resources/scala-cask/apiRoutes.mustache   |  1 +
 .../resources/scala-cask/apiService.mustache  |  1 +
 .../resources/scala-cask/appRoutes.mustache   |  1 +
 .../resources/scala-cask/baseApp.mustache     |  1 +
 .../resources/scala-cask/exampleApp.mustache  |  1 +
 .../main/resources/scala-cask/model.mustache  |  4 +--
 .../resources/scala-cask/modelData.mustache   |  4 +--
 .../scala-http4s-server/api.mustache          | 16 ++++-----
 .../main/resources/scala-http4s/api.mustache  |  2 +-
 .../resources/scala-pekko-client/api.mustache |  1 +
 .../scala-pekko-client/model_doc.mustache     |  2 ++
 .../app/apiController.scala.mustache          |  1 +
 .../app/apiImplStubs.scala.mustache           |  1 +
 .../app/apiTrait.scala.mustache               |  3 +-
 .../app/module.scala.mustache                 |  1 +
 .../extensibleObjectJsonFormat.mustache       |  1 +
 .../scala-play-server/model.mustache          |  3 ++
 .../main/resources/scala-sttp/api.mustache    |  1 +
 .../main/resources/scala-sttp4/api.mustache   |  1 +
 .../src/main/resources/scalatra/api.mustache  |  8 ++---
 .../src/main/resources/scalaz/api.mustache    |  4 +--
 .../main/resources/swift-combine/api.mustache |  1 +
 .../resources/swift-combine/model.mustache    |  5 +++
 .../swift-combine/modelObject.mustache        |  1 +
 .../swift-combine/modelObjectCustom.mustache  |  1 +
 .../resources/swift5/modelObject.mustache     |  1 +
 .../resources/swift6/modelObject.mustache     |  1 +
 .../modelTaggedUnion.mustache                 |  2 ++
 .../resources/typescript-axios/api.mustache   |  2 ++
 .../typescript-axios/apiInner.mustache        |  1 +
 .../typescript-axios/baseApi.mustache         |  1 +
 .../typescript-axios/common.mustache          |  1 +
 .../typescript-axios/configuration.mustache   |  1 +
 .../resources/typescript-axios/index.mustache |  1 +
 .../resources/typescript-axios/model.mustache |  1 +
 .../typescript-axios/modelEnum.mustache       |  2 ++
 .../resources/typescript-fetch/apis.mustache  |  1 +
 .../typescript-fetch/modelGeneric.mustache    |  1 +
 .../typescript-fetch/modelOneOf.mustache      |  1 +
 .../typescript-fetch/models.index.mustache    |  3 ++
 .../typescript-fetch/models.mustache          |  4 +++
 .../typescript-fetch/records.mustache         |  2 ++
 .../typescript-fetch/runtime.mustache         |  1 +
 .../resources/typescript-fetch/sagas.mustache |  1 +
 .../modelTaggedUnion.mustache                 |  2 ++
 .../modelTaggedUnion.mustache                 |  2 ++
 .../typescript-redux-query/apis.mustache      |  1 +
 .../typescript-redux-query/models.mustache    |  5 +++
 .../typescript-redux-query/runtime.mustache   |  1 +
 .../resources/typescript-rxjs/apis.mustache   |  1 +
 .../resources/typescript-rxjs/models.mustache |  1 +
 .../typescript-rxjs/runtime.mustache          |  1 +
 535 files changed, 829 insertions(+), 109 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/ApiClient.mustache
index d5b70d69a6fa..f1bcfa759a9b 100644
--- a/modules/openapi-generator/src/main/resources/Java/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/ApiClient.mustache
@@ -64,6 +64,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/modules/openapi-generator/src/main/resources/Java/Configuration.mustache b/modules/openapi-generator/src/main/resources/Java/Configuration.mustache
index dfd4bff142b3..c932ddf992ec 100644
--- a/modules/openapi-generator/src/main/resources/Java/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/Configuration.mustache
@@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class Configuration {
   public static final String VERSION = "{{{artifactVersion}}}";
 
diff --git a/modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache b/modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache
index 3c68faa7ddf3..e96325c40945 100644
--- a/modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache
@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
   private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/Pair.mustache b/modules/openapi-generator/src/main/resources/Java/Pair.mustache
index df60535b838d..fc7d0568df00 100644
--- a/modules/openapi-generator/src/main/resources/Java/Pair.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/Pair.mustache
@@ -3,6 +3,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class Pair {
   private final String name;
   private final String value;
diff --git a/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache
index d35040f054af..c2c205c20681 100644
--- a/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache
@@ -12,6 +12,7 @@ import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
 {{>generatedAnnotation}}
+
 public class RFC3339DateFormat extends DateFormat {
   private static final long serialVersionUID = 1L;
   private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
diff --git a/modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache b/modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache
index cf61b2c2c309..ea4b0799a7de 100644
--- a/modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature;
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 
 {{>generatedAnnotation}}
+
 public class RFC3339InstantDeserializer<T extends Temporal> extends InstantDeserializer<T> {
     private static final long serialVersionUID = 1L;
     private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault();
diff --git a/modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache b/modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache
index c2ddef3523c5..91880a5e93d8 100644
--- a/modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache
@@ -8,6 +8,7 @@ import java.time.ZonedDateTime;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
 {{>generatedAnnotation}}
+
 public class RFC3339JavaTimeModule extends SimpleModule {
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache b/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
index 7284004279be..4c94d0bd0665 100644
--- a/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
  * Representing a Server configuration.
  */
 {{>generatedAnnotation}}
+
 public class ServerConfiguration {
     public String URL;
     public String description;
diff --git a/modules/openapi-generator/src/main/resources/Java/ServerVariable.mustache b/modules/openapi-generator/src/main/resources/Java/ServerVariable.mustache
index 41246a7accd5..f8261c4443e7 100644
--- a/modules/openapi-generator/src/main/resources/Java/ServerVariable.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/ServerVariable.mustache
@@ -8,6 +8,7 @@ import java.util.HashSet;
  * Representing a Server Variable for server URL template substitution.
  */
 {{>generatedAnnotation}}
+
 public class ServerVariable {
     public String description;
     public String defaultValue;
diff --git a/modules/openapi-generator/src/main/resources/Java/StringUtil.mustache b/modules/openapi-generator/src/main/resources/Java/StringUtil.mustache
index e3d5d6e90880..31af8371f5ed 100644
--- a/modules/openapi-generator/src/main/resources/Java/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/StringUtil.mustache
@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/Java/api.mustache b/modules/openapi-generator/src/main/resources/Java/api.mustache
index f0e57bd127e6..3cfd92db038d 100644
--- a/modules/openapi-generator/src/main/resources/Java/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/api.mustache
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;
diff --git a/modules/openapi-generator/src/main/resources/Java/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/apiException.mustache
index 894486729ec7..93e28ec89315 100644
--- a/modules/openapi-generator/src/main/resources/Java/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/apiException.mustache
@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache
index 991ae2350035..8703bedd33cc 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/auth/Authentication.mustache
index 2dfab52ec84d..78bddebaf126 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/Authentication.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
   /**
    * Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache
index b5c72de6e7e9..be2863d628b3 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache
index a56f4c4c898b..5290e3fb733c 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache
@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private Supplier<String> tokenSupplier;
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/auth/OAuth.mustache
index 5cb98e7cb3b6..a500f67cf4b7 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/OAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/auth/OAuthFlow.mustache b/modules/openapi-generator/src/main/resources/Java/auth/OAuthFlow.mustache
index 7a4252662f58..8dd1cad4e4d8 100644
--- a/modules/openapi-generator/src/main/resources/Java/auth/OAuthFlow.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/auth/OAuthFlow.mustache
@@ -6,6 +6,7 @@ package {{invokerPackage}}.auth;
  * OAuth flows that are supported by this client
  */
 {{>generatedAnnotation}}
+
 public enum OAuthFlow {
     ACCESS_CODE, //called authorizationCode  in OpenAPI 3.0
     IMPLICIT,
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
index 21ed713ef4d8..7a5315a69b29 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -86,6 +86,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/BaseApi.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/BaseApi.mustache
index 8b48de086af7..f046b1995bcb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/BaseApi.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/BaseApi.mustache
@@ -7,6 +7,7 @@ import java.util.Collections;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 public abstract class BaseApi {
 
   protected ApiClient apiClient;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache
index e9516a7476ff..a11a0367565d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache
@@ -29,6 +29,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} extends BaseApi {
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache
index 251bdd7ac9c2..077e7099f68e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache
@@ -53,6 +53,7 @@ import feign.Retryer;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient {
   protected static final Logger log = Logger.getLogger(ApiClient.class.getName());
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
index 3a1bf77e5c29..0ec95e7a86f4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.validation.Valid;
 import feign.*;
 
 {{>generatedAnnotation}}
+
 public interface {{classname}} extends ApiClient.Api {
 
 {{#operations}}{{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache
index 0c178ae6a13d..9fee98bd0ffd 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache
@@ -12,6 +12,7 @@ import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthenticati
 import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
 
 {{>generatedAnnotation}}
+
 public class DefaultApi20Impl extends DefaultApi20 {
 
     private final String accessTokenEndpoint;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
index 8309a1f755ca..1baa48c1a183 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
@@ -10,6 +10,7 @@ import feign.RequestTemplate;
 import java.util.Collection;
 
 {{>generatedAnnotation}}
+
 public abstract class OAuth implements RequestInterceptor {
 
   //https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache
index 3b8c3421aa7d..95a6195a9746 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache
@@ -6,6 +6,7 @@ import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.model.OAuth2AccessToken;
 
 {{>generatedAnnotation}}
+
 public class OauthClientCredentialsGrant extends OAuth {
 
   public OauthClientCredentialsGrant(String authorizationUrl, String tokenUrl, String scopes) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache
index b51ee916186d..cc3ceb8efbfa 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache
@@ -6,6 +6,7 @@ import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.model.OAuth2AccessToken;
 
 {{>generatedAnnotation}}
+
 public class OauthPasswordGrant extends OAuth {
 
   private String username;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
index 76f119eb4ef7..01df5d7c0c26 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
@@ -33,10 +33,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -72,7 +74,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isContainer}}
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
   {{^vendorExtensions.x-is-jackson-optional-nullable}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#isContainer}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
@@ -190,12 +192,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -224,6 +227,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -249,6 +253,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/feign/additional_properties}}
+
   @Override
   public boolean equals(Object o) {
   {{#useReflectionEqualsHashCode}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache
index 56e3bb7464f1..32b3cae75045 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 {{>generatedAnnotation}}
+
 public class ApiClient {
     protected final String basePath;
     protected final HttpRequestFactory httpRequestFactory;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api.mustache
index f2875be78ff3..757ee73e9261 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api.mustache
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.ArrayList;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
     private ApiClient apiClient;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
index d92c85e26728..8e5c32da75ad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
@@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 {{>generatedAnnotation}}
+
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -135,4 +136,5 @@ public abstract class AbstractOpenApiSchema {
 
 {{>libraries/jersey2/additional_properties}}
 
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index f096a28dc334..dc78a917acd2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -84,6 +84,7 @@ import {{invokerPackage}}.auth.OAuth;
  * <p>ApiClient class.</p>
  */
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
index bdd24ba47ec2..55b6e232c74e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType;
 import {{javaxPackage}}.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
index db8b93e6f60e..5c2c2a4e523c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
@@ -119,6 +119,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/jersey2/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
index d9e9bf14bcd6..c663d7580a7e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;
@@ -205,7 +206,7 @@ public class {{classname}} {
 
   public class API{{operationId}}Request {
     {{#allParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     private {{{dataType}}} {{paramName}};
     {{/allParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache
index d10322379483..d957acd81fd1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache
@@ -13,6 +13,7 @@ import java.util.TreeMap;
  * API Exception
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache
index 1731f936fb87..82576065ff07 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache
index 05fba96ddcd8..169e3abdc3ee 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache
index 13cecfa90a73..2a8774b6aa58 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache
@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache
index 110a11ea7798..cb78e4799209 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
index 6617522ed1b4..4725badff4a5 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
@@ -21,6 +21,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private static final Logger log = Logger.getLogger(OAuth.class.getName());
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache
index be1aedcf2f31..f17263f088ca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache
@@ -2,17 +2,21 @@
 
 {{#isEnum}}
 {{>enum_outer_doc}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{^oneOf.isEmpty}}
 {{>model_oneof_doc}}
+
 {{/oneOf.isEmpty}}
 {{^anyOf.isEmpty}}
 {{>model_anyof_doc}}
+
 {{/anyOf.isEmpty}}
 {{^anyOf}}
 {{^oneOf}}
 {{>pojo_doc}}
+
 {{/oneOf}}
 {{/anyOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
index 88e9f0f633f1..1e00471099f8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
@@ -181,6 +181,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/jersey2/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
index 0d8bc23c6cc7..d3fa205af150 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
@@ -37,11 +37,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{^isContainer}}
     {{^vendorExtensions.x-enum-as-string}}
 {{>modelInnerEnum}}
+
     {{/vendorExtensions.x-enum-as-string}}
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -81,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
@@ -198,9 +200,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -232,6 +235,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -266,6 +270,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/jersey2/additional_properties}}
+
   /**
    * Return true if this {{name}} object is equal to o.
    */
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache
index d92c85e26728..8e5c32da75ad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache
@@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 {{>generatedAnnotation}}
+
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -135,4 +136,5 @@ public abstract class AbstractOpenApiSchema {
 
 {{>libraries/jersey2/additional_properties}}
 
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
index f096a28dc334..dc78a917acd2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
@@ -84,6 +84,7 @@ import {{invokerPackage}}.auth.OAuth;
  * <p>ApiClient class.</p>
  */
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache
index bdd24ba47ec2..55b6e232c74e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType;
 import {{javaxPackage}}.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache
index db8b93e6f60e..5c2c2a4e523c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache
@@ -119,6 +119,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/jersey2/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache
index d9e9bf14bcd6..c663d7580a7e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;
@@ -205,7 +206,7 @@ public class {{classname}} {
 
   public class API{{operationId}}Request {
     {{#allParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     private {{{dataType}}} {{paramName}};
     {{/allParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache
index d10322379483..d957acd81fd1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache
@@ -13,6 +13,7 @@ import java.util.TreeMap;
  * API Exception
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache
index 1731f936fb87..82576065ff07 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache
index 05fba96ddcd8..169e3abdc3ee 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache
index 13cecfa90a73..2a8774b6aa58 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache
@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache
index 110a11ea7798..cb78e4799209 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
index 6617522ed1b4..4725badff4a5 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
@@ -21,6 +21,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private static final Logger log = Logger.getLogger(OAuth.class.getName());
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache
index be1aedcf2f31..f17263f088ca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache
@@ -2,17 +2,21 @@
 
 {{#isEnum}}
 {{>enum_outer_doc}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{^oneOf.isEmpty}}
 {{>model_oneof_doc}}
+
 {{/oneOf.isEmpty}}
 {{^anyOf.isEmpty}}
 {{>model_anyof_doc}}
+
 {{/anyOf.isEmpty}}
 {{^anyOf}}
 {{^oneOf}}
 {{>pojo_doc}}
+
 {{/oneOf}}
 {{/anyOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache
index 88e9f0f633f1..1e00471099f8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache
@@ -181,6 +181,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/jersey2/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
index 0d8bc23c6cc7..d3fa205af150 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
@@ -37,11 +37,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{^isContainer}}
     {{^vendorExtensions.x-enum-as-string}}
 {{>modelInnerEnum}}
+
     {{/vendorExtensions.x-enum-as-string}}
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -81,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
@@ -198,9 +200,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -232,6 +235,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -266,6 +270,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/jersey2/additional_properties}}
+
   /**
    * Return true if this {{name}} object is equal to o.
    */
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache
index e3669ec21497..875c73f0f9a4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache
@@ -55,9 +55,11 @@ import {{rootJavaEEPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
index 0fd4c0d7c219..b8e34e608f1f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
@@ -4,6 +4,7 @@
 ){{/hasVars}}
 {{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}}
 {{> xmlAnnotation }}
+
 {{/withXml}}
 {{#jackson}}
 @JsonPropertyOrder({
@@ -58,6 +59,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
 {{/isContainer}}
   {{/vars}}
 {{>additional_properties}}
+
 {{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}
   public {{classname}}() {
   }
@@ -150,4 +152,5 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
 
   {{/vars}}
 {{>pojoOverrides}}
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache
index f196a13ec9db..8369ee7285e0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 {{>generatedAnnotation}}
+
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -133,4 +134,5 @@ public abstract class AbstractOpenApiSchema {
 
 {{>libraries/native/additional_properties}}
 
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
index 7b7e05a44b34..6696f9dbd051 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
@@ -43,6 +43,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  * a fluent style of configuration.</p>
  */
 {{>generatedAnnotation}}
+
 public class ApiClient {
 
   protected HttpClient.Builder builder;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache
index e2f8f6cd44a5..4d9f25f35c64 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache
@@ -15,6 +15,7 @@ import java.util.TreeMap;
  * @param <T> The type of data that is deserialized from response body
  */
 {{>generatedAnnotation}}
+
 public class ApiResponse<T> {
     final private int statusCode;
     final private Map<String, List<String>> headers;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache
index 496e5a1a8c77..a2020732513d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 {{>generatedAnnotation}}
+
 public class JSON {
   private ObjectMapper mapper;
 
@@ -88,7 +89,7 @@ public class JSON {
   /**
    * Helper class to register the discriminator mappings.
    */
-  {{>generatedAnnotation}}
+  {{>generatedAnnotation}}{{! prevent indent}}
   private static class ClassDiscriminatorMapping {
     // The model class name.
     Class<?> modelClass;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
index 7cc5081d87a2..cd8c2c869325 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
@@ -103,6 +103,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/native/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
index 75779701c40a..ee8ce3e2af57 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
@@ -54,6 +54,7 @@ import java.util.concurrent.CompletableFuture;
 {{/asyncNative}}
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private final HttpClient memberVarHttpClient;
@@ -129,7 +130,7 @@ public class {{classname}} {
   {{/isDeprecated}}
   public {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}}(API{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}Request apiRequest) throws ApiException {
     {{#allParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     {{{dataType}}} {{paramName}} = apiRequest.{{paramName}}();
     {{/allParams}}
     {{#returnType}}return {{/returnType}}{{^returnType}}{{#asyncNative}}return {{/asyncNative}}{{/returnType}}{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
@@ -580,11 +581,11 @@ public class {{classname}} {
 
   public static final class API{{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}Request {
     {{#requiredParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     private {{{dataType}}} {{paramName}}; // {{description}} (required)
     {{/requiredParams}}
     {{#optionalParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     private {{{dataType}}} {{paramName}}; // {{description}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}})
     {{/optionalParams}}
 
@@ -597,7 +598,7 @@ public class {{classname}} {
       {{/optionalParams}}
     }
     {{#allParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     public {{{dataType}}} {{paramName}}() {
       return {{paramName}};
     }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
index 9596b73b6db6..e8f7e340362b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
@@ -5,6 +5,7 @@ package {{invokerPackage}};
 import java.net.http.HttpHeaders;
 
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/model_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/model_doc.mustache
index be1aedcf2f31..f17263f088ca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/model_doc.mustache
@@ -2,17 +2,21 @@
 
 {{#isEnum}}
 {{>enum_outer_doc}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{^oneOf.isEmpty}}
 {{>model_oneof_doc}}
+
 {{/oneOf.isEmpty}}
 {{^anyOf.isEmpty}}
 {{>model_anyof_doc}}
+
 {{/anyOf.isEmpty}}
 {{^anyOf}}
 {{^oneOf}}
 {{>pojo_doc}}
+
 {{/oneOf}}
 {{/anyOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
index cbb4a6d63a28..89a044dc5464 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
@@ -136,6 +136,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/native/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
index 5413d1cdcd8e..283677ed6140 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
@@ -40,11 +40,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{^isContainer}}
     {{^vendorExtensions.x-enum-as-string}}
 {{>modelInnerEnum}}
+
     {{/vendorExtensions.x-enum-as-string}}
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -75,7 +77,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isContainer}}
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
   {{^vendorExtensions.x-is-jackson-optional-nullable}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
@@ -189,9 +191,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -222,6 +225,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -253,6 +257,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/native/additional_properties}}
+
   {{#parent}}
   {{#allVars}}
   {{#isOverridden}}
@@ -573,6 +578,6 @@ static {
 {{/discriminator}}
 {{#generateBuilders}}
 
-    {{>javaBuilder}}
+    {{>javaBuilder}}{{! prevent indent}}
 {{/generateBuilders}}
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
index 8d11435bef4e..30e31cf33a35 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
@@ -11,6 +11,7 @@ import java.util.Map;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 {{>generatedAnnotation}}
+
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -132,4 +133,5 @@ public abstract class AbstractOpenApiSchema {
 
 {{>libraries/jersey2/additional_properties}}
 
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index ac5095252653..9519ce13c75e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -431,11 +431,11 @@ public class {{classname}} {
 
     public class API{{operationId}}Request {
         {{#requiredParams}}
-        {{>nullable_var_annotations}}
+        {{>nullable_var_annotations}}{{! prevent indent}}
         private final {{{dataType}}} {{paramName}};
         {{/requiredParams}}
         {{#optionalParams}}
-        {{>nullable_var_annotations}}
+        {{>nullable_var_annotations}}{{! prevent indent}}
         private {{{dataType}}} {{paramName}};
         {{/optionalParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache
index 3cd6edaf718e..15a012dd6956 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache
@@ -15,6 +15,7 @@ import java.util.TreeMap;
  */
 @SuppressWarnings("serial")
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache
index 24bfb4c1f91a..d3f30b77cc52 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache
@@ -28,6 +28,7 @@ import software.amazon.awssdk.regions.Region;
 import okio.Buffer;
 
 {{>generatedAnnotation}}
+
 public class AWS4Auth implements Authentication {
 
   private AwsCredentials credentials;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
index a0dda669a899..ee02f7cece7f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache
index 44c991d76d4e..da1e1902cc4b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
index abe1cb8b878f..c0a85528bc4c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
@@ -12,6 +12,7 @@ import java.util.Optional;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private Supplier<String> tokenSupplier;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache
index 34d359857181..f664362efe04 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache
@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
index 8a6b1d1d1c20..be357cac7a81 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -49,10 +49,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -70,7 +72,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
 
   {{/vars}}
@@ -159,9 +161,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -187,6 +190,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/vars}}
 {{>libraries/okhttp-gson/additional_properties}}
 
+
   @Override
   public boolean equals(Object o) {
   {{#useReflectionEqualsHashCode}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
index 068a2f24a153..2eaf301646c9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
@@ -67,6 +67,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{invokerPackage}}.ApiClient")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache
index 4b08a644db9f..5604a46b30c6 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache
@@ -37,6 +37,7 @@ import org.springframework.web.client.RestClient.ResponseSpec;
 import org.springframework.web.client.RestClientResponseException;
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{package}}.{{classname}}")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/ApiKeyAuth.mustache
index d329303364a9..a5662c4a7694 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/ApiKeyAuth.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/Authentication.mustache
index a0678c2c5dd9..70b1d1054cfa 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/Authentication.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and / or query parameters.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBasicAuth.mustache
index fba126558728..4ee900963073 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBasicAuth.mustache
@@ -9,6 +9,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBearerAuth.mustache
index ecf258a23bed..93fe8732a38c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/HttpBearerAuth.mustache
@@ -8,6 +8,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private Supplier<String> tokenSupplier;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/OAuth.mustache
index 1b7ad33a33f4..55b5da8eb943 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/auth/OAuth.mustache
@@ -11,6 +11,7 @@ import org.springframework.util.MultiValueMap;
  * Provides support for RFC 6750 - Bearer Token usage for OAUTH 2.0 Authorization.
  */
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private Supplier<String> tokenSupplier;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
index da0c3fc9f88f..177c1e1658fe 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
@@ -38,10 +38,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -65,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
@@ -211,12 +213,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -248,6 +251,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -273,6 +277,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/restclient/additional_properties}}
+
   {{#parent}}
   {{#readWriteVars}}
   {{#isOverridden}}
@@ -614,7 +619,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{/parcelableModel}}
 {{#generateBuilders}}
 
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
 {{/generateBuilders}}
 
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
index 10f846e5f7be..7a3b64e31946 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
@@ -55,6 +55,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache
index e4097fc85c4b..5094d1b81c02 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache
@@ -14,6 +14,7 @@ import java.text.DateFormat;
 import {{javaxPackage}}.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/api.mustache
index 2e654d169dde..8d8dd28cd17c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/api.mustache
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
index 2b23e0017bee..e6d693e0b298 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
@@ -86,6 +86,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{invokerPackage}}.ApiClient")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/BaseApi.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/BaseApi.mustache
index 3b47979ed6f0..fe54fcf7b1d8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/BaseApi.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/BaseApi.mustache
@@ -8,6 +8,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
 {{>generatedAnnotation}}
+
 public abstract class BaseApi {
 
     protected ApiClient apiClient;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
index 6cf513730b38..eb0f4b50c21c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
@@ -33,6 +33,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{package}}.{{classname}}")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache
index d329303364a9..a5662c4a7694 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache
index a0678c2c5dd9..70b1d1054cfa 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and / or query parameters.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache
index fba126558728..4ee900963073 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache
@@ -9,6 +9,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache
index ecf258a23bed..93fe8732a38c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache
@@ -8,6 +8,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private Supplier<String> tokenSupplier;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache
index 1b7ad33a33f4..55b5da8eb943 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache
@@ -11,6 +11,7 @@ import org.springframework.util.MultiValueMap;
  * Provides support for RFC 6750 - Bearer Token usage for OAUTH 2.0 Authorization.
  */
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private Supplier<String> tokenSupplier;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
index 192b7014c16a..7d95c7bbc5da 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
@@ -38,10 +38,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -65,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
@@ -211,12 +213,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -248,6 +251,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -273,6 +277,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/resttemplate/additional_properties}}
+
   {{#parent}}
   {{#readWriteVars}}
   {{#isOverridden}}
@@ -614,7 +619,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{/parcelableModel}}
 {{#generateBuilders}}
 
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
 {{/generateBuilders}}
 
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON_jackson.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON_jackson.mustache
index 697e398e4633..c49cbd0f4c40 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON_jackson.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON_jackson.mustache
@@ -25,6 +25,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType;
 import {{javaxPackage}}.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
index 220d896533ce..35d4f6d3384f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
@@ -11,6 +11,7 @@ import java.util.List;
  * Holds ApiKey auth info
  */
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
index 4867dfbfdcd5..8d4043e47c48 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
@@ -47,6 +47,7 @@ import java.util.regex.Pattern;
 import static java.util.stream.Collectors.toMap;
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
     protected static final Pattern CONTENT_DISPOSITION_PATTERN = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiException.mustache
index 9ce81015615a..0445d1f088f4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiException.mustache
@@ -7,6 +7,7 @@ import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache
index e655ccf68c8b..1b6f9ba10c32 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache
@@ -21,6 +21,7 @@ import {{invokerPackage}}.Configuration;
 import {{invokerPackage}}.Pair;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}Impl implements {{classname}} {
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache
index fadbd33e5659..f89a627e5f5a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache
@@ -8,6 +8,7 @@ import io.vertx.core.MultiMap;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache
index ae2b28ee71ca..824a87500d49 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache
@@ -8,6 +8,7 @@ import io.vertx.core.MultiMap;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache
index 9bca5090a991..6f606b98bd94 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache
@@ -9,6 +9,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache
index 208eedb71224..52b284faf55a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache
@@ -9,6 +9,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache
index 5bebabf90a7b..caa215717f2c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache
@@ -8,6 +8,7 @@ import io.vertx.core.MultiMap;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache
index f01030420284..4d655b47cbdb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache
@@ -11,6 +11,7 @@ import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
index d43c980bc53b..2abc149ccfcb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
@@ -82,6 +82,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{invokerPackage}}.ApiClient")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
index 3b9d025f29f1..bdfac5271901 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
@@ -39,6 +39,7 @@ import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
 {{>generatedAnnotation}}
+
 {{#generateClientAsBean}}
 @Component("{{package}}.{{classname}}")
 {{/generateClientAsBean}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache
index d329303364a9..a5662c4a7694 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache
index a0678c2c5dd9..70b1d1054cfa 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and / or query parameters.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache
index fba126558728..4ee900963073 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache
@@ -9,6 +9,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache
index 45931f9531c9..ca1f5368f38e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private String bearerToken;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache
index 1e1e6247c80c..166475d1bbe2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache
@@ -6,6 +6,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private String accessToken;
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
index 2b9423b773f9..b4e2b6b263f8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
@@ -38,10 +38,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -65,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
@@ -211,12 +213,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -248,6 +251,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -273,6 +277,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/webclient/additional_properties}}
+
   {{#parent}}
   {{#readWriteVars}}
   {{#isOverridden}}
@@ -614,7 +619,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{/parcelableModel}}
 {{#generateBuilders}}
 
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
 {{/generateBuilders}}
 
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index 09482dd66e66..ddc3fbf8022d 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -38,10 +38,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -65,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
@@ -211,12 +213,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -248,6 +251,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -609,7 +613,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{/parcelableModel}}
 {{#generateBuilders}}
 
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
 {{/generateBuilders}}
 
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/StringUtil.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/StringUtil.mustache
index 073966b0c217..b2832d12183c 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/StringUtil.mustache
@@ -1,6 +1,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/api.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/api.mustache
index b08c1f51f20f..19474784ea1d 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/api.mustache
@@ -14,6 +14,7 @@ import {{modelPackage}}.*;
 {{/imports}}
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}  {
   /**
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
index b352785da252..f4a0175bc0ef 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
@@ -5,10 +5,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiException.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiException.mustache
index d4fcf5903fa9..fc338894cfa9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiException.mustache
@@ -4,6 +4,7 @@ package {{apiPackage}};
  * The exception that can be used to store the HTTP status code returned by an API response.
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends Exception {
     /** The HTTP status code. */
     private int code;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
index 05a79d8076bd..d4cdb1ff1485 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
@@ -6,6 +6,7 @@ import {{javaxPackage}}.servlet.*;
 import {{javaxPackage}}.servlet.http.HttpServletResponse;
 
 {{>generatedAnnotation}}
+
 public class ApiOriginFilter implements {{javaxPackage}}.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
index d3457b9dd3b1..057c51b9b60f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
@@ -8,6 +8,7 @@ import {{javaxPackage}}.xml.bind.annotation.XmlTransient;
 @{{javaxPackage}}.xml.bind.annotation.XmlRootElement
 {{/withXml}}
 {{>generatedAnnotation}}
+
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/NotFoundException.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/NotFoundException.mustache
index 40c25c5ea5c4..998c25695790 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/NotFoundException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/NotFoundException.mustache
@@ -1,6 +1,7 @@
 package {{apiPackage}};
 
 {{>generatedAnnotation}}
+
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/StringUtil.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/StringUtil.mustache
index b1b47ccc7f7b..eb09f8de7f37 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/StringUtil.mustache
@@ -1,6 +1,7 @@
 package {{apiPackage}};
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
index d22874dd390e..dd85250a44db 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
@@ -36,6 +36,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(description = "the {{{baseName}}} API")
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}  {
    private final {{classname}}Service delegate;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
index 72682d96fba3..2d87af27fa2f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.validation.constraints.*;
 import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
+
 {{#operations}}
 public abstract class {{classname}}Service {
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
index 5a4226224ff2..64d5481310f0 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
@@ -4,6 +4,7 @@ import {{package}}.{{classname}}Service;
 import {{package}}.impl.{{classname}}ServiceImpl;
 
 {{>generatedAnnotation}}
+
 public class {{classname}}ServiceFactory {
     private static final {{classname}}Service service = new {{classname}}ServiceImpl();
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
index 4d20508f3874..eea3b8f4f089 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
@@ -21,6 +21,7 @@ import {{javaxPackage}}.validation.constraints.*;
 import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ServiceImpl extends {{classname}}Service {
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache
index 844728cff62b..a7542d0de333 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache
@@ -32,6 +32,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}
 
+
 public class {{classname}}  {
 
   @Context SecurityContext securityContext;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache
index a057e4c9726f..84de2630fca7 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.ws.rs.core.Response;
 import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public interface {{classname}}Service {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache
index 45b7aa79db36..842a7235b956 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache
@@ -23,6 +23,7 @@ import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 @RequestScoped
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ServiceImpl implements {{classname}}Service {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumOuterClass.mustache
index aa1e25784ed8..f0bf027b430b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumOuterClass.mustache
@@ -10,3 +10,4 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 {{/jackson}}
 
 {{>enumClass}}
+
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/model.mustache
index 01e2f2e68ca6..cb8a5021d665 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/model.mustache
@@ -14,9 +14,11 @@ import {{javaxPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache
index 01e2f2e68ca6..cb8a5021d665 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache
@@ -14,9 +14,11 @@ import {{javaxPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/api.mustache
index c734c4bee1d0..4ed6cc399c85 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/api.mustache
@@ -41,6 +41,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @Tag(description = "the {{{baseName}}} API", name = "")
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}  {
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pojo.mustache
index 56d29332ff4b..64bd4a3644dc 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pojo.mustache
@@ -18,10 +18,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
index 374e0ee54270..232645780589 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
@@ -18,10 +18,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache
index d4fcf5903fa9..fc338894cfa9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache
@@ -4,6 +4,7 @@ package {{apiPackage}};
  * The exception that can be used to store the HTTP status code returned by an API response.
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends Exception {
     /** The HTTP status code. */
     private int code;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache
index a964396f4c0f..8a03a743150a 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache
@@ -6,6 +6,7 @@ import {{javaxPackage}}.servlet.*;
 import {{javaxPackage}}.servlet.http.HttpServletResponse;
 
 {{>generatedAnnotation}}
+
 public class ApiOriginFilter implements {{javaxPackage}}.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache
index 446b6a1bb699..f2afe5a9991e 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache
@@ -4,6 +4,7 @@ import {{javaxPackage}}.xml.bind.annotation.XmlTransient;
 
 @{{javaxPackage}}.xml.bind.annotation.XmlRootElement
 {{>generatedAnnotation}}
+
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache
index 40c25c5ea5c4..998c25695790 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache
@@ -1,6 +1,7 @@
 package {{apiPackage}};
 
 {{>generatedAnnotation}}
+
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache
index 073966b0c217..b2832d12183c 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/StringUtil.mustache
@@ -1,6 +1,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/api.mustache
index a7d9d61c90ec..19f18ba18eb9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/api.mustache
@@ -32,6 +32,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(description = "the {{{baseName}}} API")
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}  {
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache
index e94f6ddd52ae..910ad5df8bb2 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache
@@ -21,6 +21,7 @@ import {{javaxPackage}}.ws.rs.core.Response;
 import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public interface {{classname}}Service {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache
index 577f9b165e8b..f2567894bbd1 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache
@@ -23,6 +23,7 @@ import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 @RequestScoped
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ServiceImpl implements {{classname}}Service {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/api.mustache
index afd3787a2b07..0895a30ba0d7 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/api.mustache
@@ -28,6 +28,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(description = "the {{{baseName}}} API")
 {{>generatedAnnotation}}
+
 {{#operations}}
 public interface {{classname}}  {
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/apiServiceImpl.mustache
index 3488840a4627..798d872f9138 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/apiServiceImpl.mustache
@@ -20,6 +20,7 @@ import {{javaxPackage}}.ws.rs.core.Response;
 import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ServiceImpl implements {{classname}} {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/model.mustache
index ac974f01c9b9..976f2c1aedb9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/model.mustache
@@ -15,9 +15,11 @@ import {{javaxPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/model.mustache
index ac974f01c9b9..976f2c1aedb9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/model.mustache
@@ -15,9 +15,11 @@ import {{javaxPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
index f1d6c64b3a3d..e201761bb360 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache
@@ -28,6 +28,7 @@ import {{javaxPackage}}.validation.Valid;{{/useBeanValidation}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}
+
 public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
 {{#operations}}
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache
index 8f40dc3a9e7f..e82436be12fd 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache
@@ -100,6 +100,7 @@ import {{javaxPackage}}.validation.Valid;{{/useBeanValidation}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}
+
 public {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
 {{#operations}}
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache
index 7f9e087d61f0..03d5488e4bc3 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache
@@ -14,6 +14,7 @@ import {{javaxPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}{{>pojo}}{{/isEnum}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
index fec3a42b1bbd..441b84942298 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -21,11 +21,11 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
   {{#vars}}
   {{#isEnum}}
   {{^isContainer}}
-  {{>enumClass}}
+  {{>enumClass}}{{! prevent indent}}
   {{/isContainer}}
   {{#isContainer}}
   {{#mostInnerItems}}
-  {{>enumClass}}
+  {{>enumClass}}{{! prevent indent}}
   {{/mostInnerItems}}
   {{/isContainer}}
   {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/model.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/model.mustache
index 3fe07a718f38..93138e8ca652 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/model.mustache
@@ -12,9 +12,11 @@ import {{javaxPackage}}.validation.*;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache
index 646364fd2532..cf05e2d6e63b 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache
@@ -19,6 +19,7 @@ import {{javaxPackage}}.validation.constraints.*;
 import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ControllerImp {{#useInterfaces}}extends {{classname}}ControllerImpInterface{{/useInterfaces}} {
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache
index c7e3dcc271e6..b861564ad7ed 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache
@@ -41,6 +41,7 @@ import openapitools.OpenAPIUtils.ApiAction;
 {{/wrapCalls}}
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}Controller extends Controller {
     {{^controllerOnly}}
@@ -225,7 +226,7 @@ public class {{classname}}Controller extends Controller {
         {{/controllerOnly}}
         {{/useInterfaces}}
         {{^useInterfaces}}
-        {{>responseToResult}}
+        {{>responseToResult}}{{! prevent indent}}
         {{/useInterfaces}}
     }
 
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache
index a7f44d4d8a67..1dd0da14cf35 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiInterface.mustache
@@ -41,6 +41,7 @@ public abstract class {{classname}}ControllerImpInterface {
 {{#operation}}
     public {{#supportAsync}}CompletionStage<{{/supportAsync}}Result{{#supportAsync}}>{{/supportAsync}} {{operationId}}Http(Http.Request request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{^-last}}, {{/-last}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}} {
 {{>responseToResult}}
+
     }
 
     public abstract {{^returnType}}void{{/returnType}}{{#returnType}}{{#supportAsync}}CompletionStage<{{/supportAsync}}{{>returnTypesNoVoid}}{{#supportAsync}}>{{/supportAsync}}{{/returnType}} {{operationId}}(Http.Request request{{#hasParams}}, {{/hasParams}}{{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{^-last}}, {{/-last}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}};
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
index f16334328b4f..0b57fe040cc8 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
@@ -16,10 +16,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -34,13 +36,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
   {{/vendorExtensions.x-field-extra-annotation}}
   {{#isContainer}}
   {{#useBeanValidation}}
-  {{>beanValidation}}
+  {{>beanValidation}}{{! prevent indent}}
   {{/useBeanValidation}}
   private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
   {{/isContainer}}
   {{^isContainer}}
   {{#useBeanValidation}}
-  {{>beanValidation}}
+  {{>beanValidation}}{{! prevent indent}}
   {{/useBeanValidation}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
index 6b2fc077bb5e..c04ae5d469f9 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
@@ -85,6 +85,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import {{javaxPackage}}.annotation.Generated;
 
 {{>generatedAnnotation}}
+
 {{#useBeanValidation}}{{^useSpringBuiltInValidation}}@Validated{{/useSpringBuiltInValidation}}{{/useBeanValidation}}
 {{#useSpringController}}
 {{#useResponseEntity}}
@@ -276,7 +277,7 @@ public interface {{classname}} {
     {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{>responseType}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}{{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}{{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}}final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} {
         {{/delegate-method}}
         {{^isDelegate}}
-        {{>methodBody}}
+        {{>methodBody}}{{! prevent indent}}
         {{/isDelegate}}
         {{#isDelegate}}
         {{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}});
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
index abd66444e525..7c51ecfcfec3 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
@@ -52,6 +52,7 @@ import java.util.Optional;
 import {{javaxPackage}}.annotation.Generated;
 
 {{>generatedAnnotation}}
+
 {{#useResponseEntity}}
 @Controller
 {{/useResponseEntity}}
@@ -127,13 +128,13 @@ public class {{classname}}Controller implements {{classname}} {
     ) {
     {{^isDelegate}}
         {{^async}}
-        {{>methodBody}}
+        {{>methodBody}}{{! prevent indent}}
         {{/async}}
         {{#async}}
         return new Callable<{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}>() {
             @Override
             public {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} call() {
-                {{>methodBody}}
+                {{>methodBody}}{{! prevent indent}}
             }
         };
         {{/async}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
index 0af0e75823d7..a14a42a8d0b7 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
@@ -35,6 +35,7 @@ import {{javaxPackage}}.annotation.Generated;
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
 {{>generatedAnnotation}}
+
 public interface {{classname}}Delegate {
 {{#jdk8-default-interface}}
 
@@ -70,7 +71,7 @@ public interface {{classname}}Delegate {
     {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{>responseType}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isArray}}List<{{/isArray}}{{#reactive}}Flux<Part>{{/reactive}}{{^reactive}}{{#isFormParam}}MultipartFile{{/isFormParam}}{{^isFormParam}}{{>optionalDataType}}{{/isFormParam}}{{/reactive}}{{#isArray}}>{{/isArray}}{{/isFile}} {{paramName}}{{^-last}},
         {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}},
         {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}}{{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}} {
-        {{>methodBody}}
+        {{>methodBody}}{{! prevent indent}}
     }{{/jdk8-default-interface}}
 
 {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiException.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiException.mustache
index 80f0818b59c3..57f2e27c0d80 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiException.mustache
@@ -6,6 +6,7 @@ import {{javaxPackage}}.annotation.Generated;
  * The exception that can be used to store the HTTP status code returned by an API response.
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends Exception {
     /** The HTTP status code. */
     private int code;
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiOriginFilter.mustache
index f71bbb838d7d..b4126a8ff7c4 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiOriginFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiOriginFilter.mustache
@@ -7,6 +7,7 @@ import {{javaxPackage}}.servlet.*;
 import {{javaxPackage}}.servlet.http.HttpServletResponse;
 
 {{>generatedAnnotation}}
+
 public class ApiOriginFilter implements {{javaxPackage}}.servlet.Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiResponseMessage.mustache
index 73d13380f51c..151dc0efec71 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiResponseMessage.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiResponseMessage.mustache
@@ -4,6 +4,7 @@ import {{javaxPackage}}.annotation.Generated;
 import {{javaxPackage}}.xml.bind.annotation.XmlTransient;
 
 {{>generatedAnnotation}}
+
 @{{javaxPackage}}.xml.bind.annotation.XmlRootElement
 public class ApiResponseMessage {
     public static final int ERROR = 1;
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
index 6b814e14322b..436a12ddb4ff 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * {{^description}}Gets or Sets {{{name}}}{{/description}}{{{description}}}
  */
 {{>additionalEnumTypeAnnotations}}
+
 {{>generatedAnnotation}}
+
 public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}{{#vendorExtensions.x-implements}}{{#-first}} implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
   {{#gson}}
   {{#allowableValues}}{{#enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache
index 1ffd76344ccb..e55842162f0b 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache
@@ -31,6 +31,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public interface {{classname}} {
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
index 23cf601c88ef..44a4717a69d4 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
@@ -54,6 +54,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 {{/additionalPropertiesType}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#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}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/notFoundException.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/notFoundException.mustache
index 98f76b2710fb..3a5bb682404b 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/notFoundException.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/notFoundException.mustache
@@ -3,6 +3,7 @@ package {{apiPackage}};
 import {{javaxPackage}}.annotation.Generated;
 
 {{>generatedAnnotation}}
+
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache
index e83ac99867f5..f8f79802bbc8 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache
@@ -1,11 +1,14 @@
 {{>additionalOneOfTypeAnnotations}}
 {{#withXml}}
 {{>xmlAnnotation}}
+
 {{/withXml}}
 {{#discriminator}}
 {{>typeInfoAnnotation}}
+
 {{/discriminator}}
 {{>generatedAnnotation}}
+
 public {{>sealed}}interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {{>permits}}{
     {{#discriminator}}
     public {{propertyType}} {{propertyGetter}}();
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/openapiDocumentationConfig.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/openapiDocumentationConfig.mustache
index 9a08ea786088..cb0d595d93d1 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/openapiDocumentationConfig.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/openapiDocumentationConfig.mustache
@@ -22,6 +22,7 @@ import {{javaxPackage}}.annotation.Generated;
 import {{javaxPackage}}.servlet.ServletContext;
 
 {{>generatedAnnotation}}
+
 @Configuration
 @EnableSwagger2
 public class SpringFoxConfiguration {
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index f525c6b3e524..835f2ffa6f0d 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -3,6 +3,7 @@
  * @deprecated{{/isDeprecated}}
  */
 {{>additionalModelTypeAnnotations}}
+
 {{#isDeprecated}}
 @Deprecated
 {{/isDeprecated}}
@@ -16,6 +17,7 @@
 {{/description}}
 {{#discriminator}}
 {{>typeInfoAnnotation}}
+
 {{/discriminator}}
 {{#jackson}}
 {{#isClassnameSanitized}}
@@ -26,8 +28,10 @@
 {{/jackson}}
 {{#withXml}}
 {{>xmlAnnotation}}
+
 {{/withXml}}
 {{>generatedAnnotation}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
@@ -41,10 +45,12 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -225,7 +231,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
   {{#useBeanValidation}}
-  {{>beanValidation}}
+  {{>beanValidation}}{{! prevent indent}}
   {{/useBeanValidation}}
   {{^useBeanValidation}}
   {{#required}}@NotNull{{/required}}
@@ -279,6 +285,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{! end feature: getter and setter }}
   {{/vars}}
 {{>additionalProperties}}
+
   {{^lombok.Data}}
   {{#parentVars}}
 
@@ -366,7 +373,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   }
   {{/lombok.ToString}}
   {{#generateBuilders}}
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
   {{/generateBuilders}}
   {{/lombok.Data}}
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/api.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/api.mustache
index 183d23c28eb6..80ece198cae6 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/api.mustache
@@ -21,9 +21,11 @@ public interface {{classname}}  {
     //{{#vendorExtensions}}{{x-serviceid}}{{/vendorExtensions}}
     {{#rxInterface}}
 {{>RxMethod}}
+
     {{/rxInterface}}
     {{^rxInterface}}
 {{>AsyncMethod}}
+
     {{/rxInterface}}
 
 {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
index 297495efb232..0758565d4783 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
@@ -98,9 +98,11 @@ public class {{classname}}Verticle extends AbstractVerticle {
                 {{/hasParams}}
                 {{#rxInterface}}
 {{>RxCall}}
+
                 {{/rxInterface}}
                 {{^rxInterface}}
 {{>AsyncCall}}
+
                 {{/rxInterface}}
             } catch (Exception e) {
                 logUnexpectedError("{{#vendorExtensions}}{{x-serviceid}}{{/vendorExtensions}}", e);
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache
index bc69d91c3423..fea674f33638 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache
@@ -74,8 +74,10 @@ class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}e
 
 {{#vars}}{{#isEnum}}{{^isContainer}}
 {{>partial_model_inner_enum}}
+
 {{/isContainer}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{^isContainer}}
 {{>partial_model_inner_enum}}
+
 {{/isContainer}}{{/items}}{{/items.isEnum}}{{/vars}}
 
 export default {{classname}};
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache
index 16912ed81168..d072e83a5382 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable no-use-before-define */
 {{>licenseInfo}}
 
+
 import * as url from "url";
 import * as portableFetch from "portable-fetch";
 import { Configuration } from "./configuration";
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/configuration.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/configuration.mustache
index 4c6144d5d472..535729734af8 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/configuration.mustache
@@ -1,6 +1,7 @@
 // @flow
 {{>licenseInfo}}
 
+
 export type ConfigurationParameters = {
     apiKey?: string | (name: string) => string;
     username?: string;
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/index.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/index.mustache
index 44d58c71f1bd..5f8b55aa31ac 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/index.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/index.mustache
@@ -1,5 +1,6 @@
 // @flow
 {{>licenseInfo}}
 
+
 export * from "./api";
 export * from "./configuration";
diff --git a/modules/openapi-generator/src/main/resources/Javascript/model.mustache b/modules/openapi-generator/src/main/resources/Javascript/model.mustache
index ab9f0f3e8fee..c2783a3a3339 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/model.mustache
@@ -6,11 +6,13 @@ import ApiClient from '../ApiClient';
 {{#model}}
 {{#isEnum}}
 {{>partial_model_enum_class}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>partial_model_oneof}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
@@ -21,6 +23,7 @@ import ApiClient from '../ApiClient';
 {{/anyOf}}
 {{^anyOf}}
 {{>partial_model_generic}}
+
 {{/anyOf}}
 {{/oneOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
index 20b83c837829..6bcb45614e40 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
@@ -171,8 +171,10 @@ class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}e
 
 {{#vars}}{{#isEnum}}{{^isContainer}}
 {{>partial_model_inner_enum}}
+
 {{/isContainer}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{^isContainer}}
 {{>partial_model_inner_enum}}
+
 {{/isContainer}}{{/items}}{{/items.isEnum}}{{/vars}}
 
 export default {{classname}};
diff --git a/modules/openapi-generator/src/main/resources/apex/pojo.mustache b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
index bb21f63f5482..3c1a6e80bd0d 100644
--- a/modules/openapi-generator/src/main/resources/apex/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
@@ -6,12 +6,14 @@ public class {{classname}}{{#parent}} extends {{{.}}}{{/parent}}{{#interfaces}}{
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{/isEnum}}
     {{#items.isEnum}}
       {{#items}}
       {{^isContainer}}
 {{>modelInnerEnum}}
+
       {{/isContainer}}
       {{/items}}
     {{/items.isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache b/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
index 221296c83437..2cc011cc0864 100644
--- a/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
+++ b/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
@@ -75,6 +75,7 @@ Operation Id:: {{nickname}}
 
 {{> params}}
 
+
 ===== Return Type
 
 {{#hasReference}}
@@ -131,3 +132,4 @@ endif::internal-generation[]
 {{/apiInfo}}
 
 {{> model}}
+
diff --git a/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache b/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
index 76409161eff1..1f3cd3582c8f 100644
--- a/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
+++ b/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
@@ -14,6 +14,7 @@
 
 {{#pathParams}}
 {{>param}}
+
 {{/pathParams}}
 |===
 {{/hasPathParams}}
@@ -32,6 +33,7 @@
 
 {{#bodyParams}}
 {{>param}}
+
 {{/bodyParams}}
 |===
 {{/hasBodyParam}}
@@ -50,6 +52,7 @@
 
 {{#formParams}}
 {{>param}}
+
 {{/formParams}}
 |===
 {{/hasFormParams}}
@@ -68,6 +71,7 @@
 
 {{#headerParams}}
 {{>param}}
+
 {{/headerParams}}
 |===
 {{/hasHeaderParams}}
@@ -86,6 +90,7 @@
 
 {{#queryParams}}
 {{>param}}
+
 {{/queryParams}}
 |===
 {{/hasQueryParams}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
index 571e3c095640..b84df25a19c1 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
@@ -22,12 +22,14 @@ namespace {{packageName}}.Models
         {{#items}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
index c97047a385bf..a8a2ac62ea8c 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
@@ -24,12 +24,14 @@ namespace {{modelPackage}}
         {{#items}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
index ed044a74b94c..40b3c057c1ff 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
@@ -55,12 +55,14 @@ namespace {{modelPackage}}
         {{#items}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
index ae6f06a4cf43..0907d9d4ca4b 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
@@ -51,14 +51,14 @@ bool {{classname}}::validate(std::stringstream& msg, const std::string& pathPref
     {{#required}}/* {{name}} */ {{/required}}{
         const {{{dataType}}}& value = m_{{name}};
         const std::string currentValuePath = _pathPrefix + ".{{nameInCamelCase}}";
-        {{> model-validation-body }}
+        {{> model-validation-body }}{{! prevent indent}}
     }
     {{/isArray}}{{^isArray}}{{#hasValidation}} {{! Only generate validation if necessary }}
     {{^required}}if ({{nameInCamelCase}}IsSet()){{/required}}
     {{#required}}/* {{name}} */ {{/required}}{
         const {{{dataType}}}& value = m_{{name}};
         const std::string currentValuePath = _pathPrefix + ".{{nameInCamelCase}}";
-        {{> model-validation-body }}
+        {{> model-validation-body }}{{! prevent indent}}
     }
     {{/hasValidation}}{{#required}}{{#isModel}}
     if (!m_{{name}}.validate(msg, _pathPrefix + ".{{nameInCamelCase}}")) {
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-struct-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-struct-source.mustache
index 4d7dbfe0a902..4a93c4c3c137 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-struct-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-struct-source.mustache
@@ -54,14 +54,14 @@ bool {{classname}}::validate(std::stringstream& msg, const std::string& pathPref
     {{#required}}/* {{name}} */ {{/required}}{
         const {{{dataType}}}& value = {{name}}{{^required}}.value(){{/required}};
         const std::string currentValuePath = _pathPrefix + ".{{nameInCamelCase}}";
-        {{> model-validation-body }}
+        {{> model-validation-body }}{{! prevent indent}}
     }
     {{/isArray}}{{^isArray}}{{#hasValidation}} {{! Only generate validation if necessary }}
     {{^required}}if ({{name}}.has_value()){{/required}}
     {{#required}}/* {{name}} */ {{/required}}{
         const {{{dataType}}}& value = {{name}}{{^required}}.value(){{/required}};
         const std::string currentValuePath = _pathPrefix + ".{{nameInCamelCase}}";
-        {{> model-validation-body }}
+        {{> model-validation-body }}{{! prevent indent}}
     }
     {{/hasValidation}}{{/isArray}}{{/vars}}{{/isEnum}}{{#vendorExtensions.x-is-string-enum-container}}{{#anyOf}}{{#-first}}
     if (!m_value.validate(msg))
diff --git a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
index b15e8d259b03..9c317f412fef 100644
--- a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
@@ -151,7 +151,7 @@ void {{vendorExtensions.x-codegen-resource-name}}Resource::defaultSessionClose(c
 void {{vendorExtensions.x-codegen-resource-name}}Resource::handler_{{httpMethod}}_internal(const std::shared_ptr<restbed::Session> session)
 {
     {{#lambda.indented}}
-    {{>api-source-HandlerBody}}
+    {{>api-source-HandlerBody}}{{! prevent indent}}
     {{/lambda.indented}}
 
 }
@@ -160,7 +160,7 @@ void {{vendorExtensions.x-codegen-resource-name}}Resource::handler_{{httpMethod}
 // x-extension
 void {{vendorExtensions.x-codegen-resource-name}}Resource::handler_{{httpMethod}}_internal(const std::shared_ptr<restbed::Session> session) {
     {{#lambda.indented}}
-    {{>api-source-HandlerBody}}
+    {{>api-source-HandlerBody}}{{! prevent indent}}
     {{/lambda.indented}}
 
 }
diff --git a/modules/openapi-generator/src/main/resources/crystal/configuration_spec.mustache b/modules/openapi-generator/src/main/resources/crystal/configuration_spec.mustache
index 9dde309808b9..49a9525703d3 100644
--- a/modules/openapi-generator/src/main/resources/crystal/configuration_spec.mustache
+++ b/modules/openapi-generator/src/main/resources/crystal/configuration_spec.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'spec_helper'
diff --git a/modules/openapi-generator/src/main/resources/crystal/model.mustache b/modules/openapi-generator/src/main/resources/crystal/model.mustache
index 8b06bff97597..31cd656198f8 100644
--- a/modules/openapi-generator/src/main/resources/crystal/model.mustache
+++ b/modules/openapi-generator/src/main/resources/crystal/model.mustache
@@ -10,15 +10,18 @@ module {{moduleName}}
 {{#model}}
 {{#isEnum}}
 {{>partial_model_enum_class}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>partial_oneof_module}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
 {{>partial_model_generic}}
+
 {{/oneOf}}
 {{/isEnum}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/crystal/model_doc.mustache b/modules/openapi-generator/src/main/resources/crystal/model_doc.mustache
index 37809685d1c0..6b4fb320f695 100644
--- a/modules/openapi-generator/src/main/resources/crystal/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/crystal/model_doc.mustache
@@ -3,10 +3,12 @@
 {{#oneOf}}
 {{#-first}}
 {{>partial_oneof_module_doc}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
 {{>partial_model_generic_doc}}
+
 {{/oneOf}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/crystal/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/crystal/partial_model_generic.mustache
index 3daff8530465..6843bf2f16ca 100644
--- a/modules/openapi-generator/src/main/resources/crystal/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/crystal/partial_model_generic.mustache
@@ -289,4 +289,5 @@
     end
 
 {{> base_object}}
+
   end
diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/model.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/model.mustache
index eebb50bf87c2..ba7185341322 100644
--- a/modules/openapi-generator/src/main/resources/csharp-functions/model.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-functions/model.mustache
@@ -28,6 +28,7 @@ namespace {{modelPackage}}
         {{#items}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
@@ -35,6 +36,7 @@ namespace {{modelPackage}}
         {{#isEnum}}
         {{^complexType}}
 {{>enumClass}}
+
         {{/complexType}}
         {{/isEnum}}
         {{/items.isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache
index 1fc337d0b5f7..f7a2abe8ebed 100644
--- a/modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache
@@ -17,12 +17,14 @@
         {{#items}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/isEnum}}
         {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache
index c14c1010ffd7..ffc90cf11305 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache
index 1b12e4173931..c9caec4793e1 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache
index c71bc79b99b0..789de490ee3d 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache
@@ -11,6 +11,7 @@ using {{packageName}}.Extensions;
 {{>testInstructions}}
 
 
+
 namespace {{packageName}}.Test.{{apiPackage}}
 {
     /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
index 209979c8db42..1441421aa299 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
@@ -17,6 +17,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         public static string[] Formats { get; } = {
 {{>DateFormats}}
+
         };
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
index 17c847365369..53fdfbee7534 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
@@ -17,6 +17,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         public static string[] Formats { get; } = {
 {{>DateFormats}}
+
         };
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
index c5187f50815d..bf5059fcaefb 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
@@ -17,6 +17,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         public static string[] Formats { get; } = {
 {{>DateTimeFormats}}
+
         };
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
index 646c729478d2..bbc036490302 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
@@ -17,6 +17,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         public static string[] Formats { get; } = {
 {{>DateTimeFormats}}
+
          };
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache
index 357626fcc6c2..8b69a8c0b182 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
index 99a9a902d03a..a416373c9dea 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
@@ -454,7 +454,7 @@
             {{/isDecimal}}
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isUuid}}
             {{/isEnum}}
@@ -465,7 +465,7 @@
             writer.WriteBoolean("{{baseName}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}});
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isBoolean}}
             {{^isEnum}}
@@ -474,7 +474,7 @@
             writer.WriteNumber("{{baseName}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}});
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isNumeric}}
             {{/isEnum}}
@@ -483,7 +483,7 @@
             writer.WriteString("{{baseName}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}}.ToString({{name}}Format));
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isDate}}
             {{#isDateTime}}
@@ -491,7 +491,7 @@
             writer.WriteString("{{baseName}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}}.ToString({{name}}Format));
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isDateTime}}
             {{#isEnum}}
@@ -500,7 +500,7 @@
             writer.WriteNumber("{{baseName}}", {{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}}));
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isNumeric}}
             {{^isMap}}
@@ -591,7 +591,7 @@
             writer.WriteString("{{baseName}}", {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}{{^required}}Option.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{/vendorExtensions.x-is-value-type}}{{/required}}{{#required}}{{#isNullable}}.Value{{/isNullable}}{{/required}});
             {{/lambda.copyText}}
             {{#lambda.indent3}}
-            {{>WriteProperty}}
+            {{>WriteProperty}}{{! prevent indent}}
             {{/lambda.indent3}}
             {{/isUuid}}
             {{^isUuid}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/Option.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/Option.mustache
index eed49143e41d..8b33bdb5146d 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/Option.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/Option.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
index e44160b658a6..7458dbd80c52 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
index 7226551b7aef..9fc5f3ea081f 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/WriteProperty.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/WriteProperty.mustache
index 99659ac26f55..03b036f9a175 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/WriteProperty.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/WriteProperty.mustache
@@ -1,9 +1,10 @@
 {{#required}}
 {{>WritePropertyHelper}}
+
 {{/required}}
 {{^required}}
 if ({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}Option.IsSet)
     {{#lambda.indent1}}
-    {{>WritePropertyHelper}}
+    {{>WritePropertyHelper}}{{! prevent indent}}
     {{/lambda.indent1}}
 {{/required}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
index 1c872fd8afb7..131de8f312a7 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
@@ -1,6 +1,7 @@
 {{#lambda.trimLineBreaks}}
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -290,6 +291,7 @@ namespace {{packageName}}.{{apiPackage}}
             bool suppressDefaultLog = false;
             After{{operationId}}({{#lambda.joinWithComma}}ref suppressDefaultLog  apiResponseLocalVar  {{#allParams}}{{paramName}}  {{/allParams}}{{/lambda.joinWithComma}});
 {{>AfterOperationDefaultImplementation}}
+
         }
 
         /// <summary>
@@ -316,6 +318,7 @@ namespace {{packageName}}.{{apiPackage}}
             bool suppressDefaultLogLocalVar = false;
             OnError{{operationId}}({{#lambda.joinWithComma}}ref suppressDefaultLogLocalVar  exceptionLocalVar  pathFormatLocalVar  pathLocalVar  {{#allParams}}{{paramName}}  {{/allParams}}{{/lambda.joinWithComma}});
 {{>OnErrorDefaultImplementation}}
+
         }
 
         /// <summary>
@@ -753,7 +756,7 @@ namespace {{packageName}}.{{apiPackage}}
             {
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#lambda.indent4}}
-                {{>AsModel}}
+                {{>AsModel}}{{! prevent indent}}
                 {{/lambda.indent4}}
                 {{/lambda.trimTrailingWithNewLine}}
             }
@@ -786,7 +789,7 @@ namespace {{packageName}}.{{apiPackage}}
                 OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode);
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#lambda.indent4}}
-                {{>OnDeserializationError}}
+                {{>OnDeserializationError}}{{! prevent indent}}
                 {{/lambda.indent4}}
                 {{/lambda.trimTrailingWithNewLine}}
             }
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
index 02ce2216830c..330b4cc8f800 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
@@ -11,6 +11,7 @@ using {{packageName}}.{{modelPackage}};{{/hasImport}}
 {{>testInstructions}}
 
 
+
 namespace {{packageName}}.Test.{{apiPackage}}
 {
     /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache
index f9931574dcf5..a9f6c2e4c20f 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache
@@ -1,5 +1,6 @@
 // <auto-generated>
 {{>partial_header}}
+
 {{#nrt}}
 #nullable enable
 
@@ -37,13 +38,17 @@ namespace {{packageName}}.{{modelPackage}}
 {
 {{#isEnum}}
 {{>modelEnum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>modelGeneric}}
 
+
 {{>JsonConverter}}
+
 {{/isEnum}}
 {{>SourceGenerationContext}}
+
 {{/model}}
 {{/lambda.trimTrailingWithNewLine}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache
index 04fb37138629..587057cddd32 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache
@@ -97,12 +97,14 @@
         {{#items}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/isEnum}}
         {{^isDiscriminator}}
@@ -388,6 +390,7 @@
 {{^parentModel}}
 
 {{>validatable}}
+
 {{/parentModel}}
 {{/validatable}}
     }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
index b5a75b6d46cf..5a95adaa11fd 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
@@ -25,12 +25,14 @@
         {{#items}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/items}}
         {{/items.isEnum}}
         {{#isEnum}}
         {{^complexType}}
 {{>modelInnerEnum}}
+
         {{/complexType}}
         {{/isEnum}}
         {{#isEnum}}
@@ -428,5 +430,6 @@
 
 {{#validatable}}
 {{>validatable}}
+
 {{/validatable}}
     }
diff --git a/modules/openapi-generator/src/main/resources/csharp/validatable.mustache b/modules/openapi-generator/src/main/resources/csharp/validatable.mustache
index 9dd8bb73356b..547821a4fc1a 100644
--- a/modules/openapi-generator/src/main/resources/csharp/validatable.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/validatable.mustache
@@ -105,7 +105,7 @@
             if (this.{{{name}}}{{#useGenericHost}}{{^required}}Option.Value{{/required}}{{/useGenericHost}} != null){
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#lambda.indent4}}
-                {{>ValidateRegex}}
+                {{>ValidateRegex}}{{! prevent indent}}
                 {{/lambda.indent4}}
 
                 {{/lambda.trimTrailingWithNewLine}}
@@ -115,7 +115,7 @@
             {{^isNullable}}
             {{#lambda.trimTrailingWithNewLine}}
             {{#lambda.indent3}}
-            {{>ValidateRegex}}
+            {{>ValidateRegex}}{{! prevent indent}}
             {{/lambda.indent3}}
 
             {{/lambda.trimTrailingWithNewLine}}
@@ -125,7 +125,7 @@
             if (this.{{{name}}}{{#useGenericHost}}{{^required}}Option.Value{{/required}}{{/useGenericHost}} != null) {
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#lambda.indent4}}
-                {{>ValidateRegex}}
+                {{>ValidateRegex}}{{! prevent indent}}
                 {{/lambda.indent4}}
 
                 {{/lambda.trimTrailingWithNewLine}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
index 9acd5ba70a08..7a9ee688596b 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
@@ -9,9 +9,11 @@ part '{{classFilename}}.g.dart';
 
 {{>serialization/built_value/class_header}} {
 {{>serialization/built_value/class_members}}
+
 }
 {{#discriminator}}{{#hasDiscriminatorWithNonEmptyMapping}}
 {{>serialization/built_value/class_discriminator}}
+
 {{/hasDiscriminatorWithNonEmptyMapping}}{{/discriminator}}
 {{>serialization/built_value/class_serializer}}{{#vendorExtensions.x-is-parent}}
 
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_inline_enums.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_inline_enums.mustache
index 1105c1b70b10..1bfa630808a0 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_inline_enums.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_inline_enums.mustache
@@ -11,11 +11,13 @@
         {{^isContainer}}
 
 {{>serialization/built_value/enum_inline}}
+
         {{/isContainer}}
         {{#isContainer}}
             {{#mostInnerItems}}
 
 {{>serialization/built_value/enum_inline}}
+
             {{/mostInnerItems}}
         {{/isContainer}}
     {{/enumName}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
index 88a25b71783f..9fad9b10087d 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
@@ -26,6 +26,7 @@ part '{{classFilename}}.g.dart';
 class {{{classname}}} {
 {{>serialization/json_serializable/dart_constructor}}
 
+
 {{#vars}}
   {{#description}}
       /// {{{description}}}
@@ -129,11 +130,13 @@ class {{{classname}}} {
         {{^isContainer}}
 
 {{>serialization/json_serializable/enum_inline}}
+
         {{/isContainer}}
         {{#isContainer}}
             {{#mostInnerItems}}
 
 {{>serialization/json_serializable/enum_inline}}
+
             {{/mostInnerItems}}
         {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/dart2/api.mustache b/modules/openapi-generator/src/main/resources/dart2/api.mustache
index c6289c2b7662..219b85dc56a1 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 {{#operations}}
 
 class {{{classname}}} {
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
index 00f5e6aeb9a5..4185524e894d 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class ApiClient {
   ApiClient({this.basePath = '{{{basePath}}}', this.authentication,});
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_exception.mustache b/modules/openapi-generator/src/main/resources/dart2/api_exception.mustache
index aeb7aa9ce226..77db90cd38e3 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_exception.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_exception.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class ApiException implements Exception {
   ApiException(this.code, this.message);
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
index 7b662906bdee..0585504c37a8 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class QueryParam {
   const QueryParam(this.name, this.value);
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/auth/api_key_auth.mustache b/modules/openapi-generator/src/main/resources/dart2/auth/api_key_auth.mustache
index 4b8f707eeb5f..1c1750fc4bc5 100644
--- a/modules/openapi-generator/src/main/resources/dart2/auth/api_key_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/auth/api_key_auth.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class ApiKeyAuth implements Authentication {
   ApiKeyAuth(this.location, this.paramName);
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/auth/authentication.mustache b/modules/openapi-generator/src/main/resources/dart2/auth/authentication.mustache
index 6eff61ede0ec..1889be86f2e5 100644
--- a/modules/openapi-generator/src/main/resources/dart2/auth/authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/auth/authentication.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 // ignore: one_member_abstracts
 abstract class Authentication {
   /// Apply authentication settings to header and query params.
diff --git a/modules/openapi-generator/src/main/resources/dart2/auth/http_basic_auth.mustache b/modules/openapi-generator/src/main/resources/dart2/auth/http_basic_auth.mustache
index c83d037c7991..d60ba89aa349 100644
--- a/modules/openapi-generator/src/main/resources/dart2/auth/http_basic_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/auth/http_basic_auth.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class HttpBasicAuth implements Authentication {
   HttpBasicAuth({this.username = '', this.password = ''});
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/auth/http_bearer_auth.mustache b/modules/openapi-generator/src/main/resources/dart2/auth/http_bearer_auth.mustache
index 6c1d3c0e843d..c3af7fc26db4 100644
--- a/modules/openapi-generator/src/main/resources/dart2/auth/http_bearer_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/auth/http_bearer_auth.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 typedef HttpBearerAuthProvider = String Function();
 
 class HttpBearerAuth implements Authentication {
diff --git a/modules/openapi-generator/src/main/resources/dart2/auth/oauth.mustache b/modules/openapi-generator/src/main/resources/dart2/auth/oauth.mustache
index 0e65baa4c637..b4a6cd942a02 100644
--- a/modules/openapi-generator/src/main/resources/dart2/auth/oauth.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/auth/oauth.mustache
@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+
 class OAuth implements Authentication {
   OAuth({this.accessToken = ''});
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/model.mustache b/modules/openapi-generator/src/main/resources/dart2/model.mustache
index 306c54e417e6..d976122956fb 100644
--- a/modules/openapi-generator/src/main/resources/dart2/model.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/model.mustache
@@ -1,15 +1,18 @@
 {{>header}}
 {{>part_of}}
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{#native_serialization}}
 {{>serialization/native/native_enum}}
+
 {{/native_serialization}}
 {{/isEnum}}
 {{^isEnum}}
 {{#native_serialization}}
 {{>serialization/native/native_class}}
+
 {{/native_serialization}}
 {{/isEnum}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache b/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
index 1d406ea46318..b4ba0b716a12 100644
--- a/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
@@ -1,5 +1,6 @@
 class {{{classname}}} {
 {{>dart_constructor}}
+
 {{#vars}}
   {{#description}}
   /// {{{.}}}
@@ -289,11 +290,13 @@ class {{{classname}}} {
         {{^isContainer}}
 
 {{>serialization/native/native_enum_inline}}
+
         {{/isContainer}}
         {{#isContainer}}
             {{#mostInnerItems}}
 
 {{>serialization/native/native_enum_inline}}
+
             {{/mostInnerItems}}
         {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/elm/operation.mustache b/modules/openapi-generator/src/main/resources/elm/operation.mustache
index d7c5db32413a..0a2fc014be7b 100644
--- a/modules/openapi-generator/src/main/resources/elm/operation.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/operation.mustache
@@ -22,7 +22,9 @@ import File exposing (File){{/includeFile}}
 {{>customType}}
 
 
+
 {{>customTypeToString}}
+
 {{/isEnum}}
 {{/allParams}}
 {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/elm/recordDecoder.mustache b/modules/openapi-generator/src/main/resources/elm/recordDecoder.mustache
index c787e2fa41a5..3310640417bd 100644
--- a/modules/openapi-generator/src/main/resources/elm/recordDecoder.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/recordDecoder.mustache
@@ -26,4 +26,5 @@
 
 
 {{>customTypeDecoder}}
+
 {{/isEnum}}{{/vars}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/elm/recordEncoder.mustache b/modules/openapi-generator/src/main/resources/elm/recordEncoder.mustache
index a268be8f1799..e03baae42d12 100644
--- a/modules/openapi-generator/src/main/resources/elm/recordEncoder.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/recordEncoder.mustache
@@ -32,4 +32,5 @@ encode{{classname}} model =
     {{#parent}}{{#allOf}}{{#lambda.camelcase}}encode{{.}}Pairs{{/lambda.camelcase}} model.{{#lambda.camelcase}}{{.}}{{/lambda.camelcase}} ++ {{/allOf}}{{/parent}}pairs{{#vars}}{{#isEnum}}
 
 {{>customTypeEncoder}}
+
 {{/isEnum}}{{/vars}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/go/model.mustache b/modules/openapi-generator/src/main/resources/go/model.mustache
index 684af1d33c64..fb38cf75a1f4 100644
--- a/modules/openapi-generator/src/main/resources/go/model.mustache
+++ b/modules/openapi-generator/src/main/resources/go/model.mustache
@@ -12,6 +12,7 @@ import (
 {{#model}}
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}{{#-first}}{{>model_oneof}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>model_anyof}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>model_simple}}{{/anyOf}}{{/oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/go/model_anyof.mustache b/modules/openapi-generator/src/main/resources/go/model_anyof.mustache
index 21e33137403a..fa0e8834f6e7 100644
--- a/modules/openapi-generator/src/main/resources/go/model_anyof.mustache
+++ b/modules/openapi-generator/src/main/resources/go/model_anyof.mustache
@@ -91,3 +91,4 @@ func (src {{classname}}) ToMap() (map[string]interface{}, error) {
 {{/discriminator}}
 
 {{>nullable_model}}
+
diff --git a/modules/openapi-generator/src/main/resources/go/model_oneof.mustache b/modules/openapi-generator/src/main/resources/go/model_oneof.mustache
index 77b6e99e072c..4abec6e0a52c 100644
--- a/modules/openapi-generator/src/main/resources/go/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/go/model_oneof.mustache
@@ -158,3 +158,4 @@ func (obj {{classname}}) GetActualInstanceValue() (interface{}) {
 }
 
 {{>nullable_model}}
+
diff --git a/modules/openapi-generator/src/main/resources/go/model_simple.mustache b/modules/openapi-generator/src/main/resources/go/model_simple.mustache
index 6e60c6a180df..2690fb9bbf5d 100644
--- a/modules/openapi-generator/src/main/resources/go/model_simple.mustache
+++ b/modules/openapi-generator/src/main/resources/go/model_simple.mustache
@@ -570,3 +570,4 @@ func (o *{{{classname}}}) UnmarshalJSON(data []byte) (err error) {
 {{/isArray}}
 {{/vendorExtensions.x-go-generate-unmarshal-json}}
 {{>nullable_model}}
+
diff --git a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/model.mustache b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/model.mustache
index eb297e923c37..baef7c993ba8 100644
--- a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/model.mustache
@@ -1,6 +1,7 @@
 {{#models}}
 {{#model}}
 {{>partial_header_graphql}}
+
 {{#description}}
 # {{{.}}}
 {{/description}}
diff --git a/modules/openapi-generator/src/main/resources/graphql-schema/model.mustache b/modules/openapi-generator/src/main/resources/graphql-schema/model.mustache
index bc2f808d8fcd..0fdbd96ce9eb 100644
--- a/modules/openapi-generator/src/main/resources/graphql-schema/model.mustache
+++ b/modules/openapi-generator/src/main/resources/graphql-schema/model.mustache
@@ -1,6 +1,7 @@
 {{#models}}
 {{#model}}
 {{>partial_header}}
+
 {{#description}}
 # {{.}}
 {{/description}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
index 314904fc4a44..86b673b15b5d 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
@@ -3,7 +3,7 @@
   <head>
     <title>{{{appName}}}</title>
     <style type="text/css">
-      {{>style.css}}
+      {{>style.css}}{{! prevent indent}}
     </style>
   </head>
   <body>
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
index 568c7e31ee05..a5774592de0a 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
@@ -6,10 +6,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta charset="UTF-8" />
-  {{>js_jquery}}
-  {{>js_prettify}}
-  {{>js_bootstrap}}
-  {{>marked}}
+  {{>js_jquery}}{{! prevent indent}}
+  {{>js_prettify}}{{! prevent indent}}
+  {{>js_bootstrap}}{{! prevent indent}}
+  {{>marked}}{{! prevent indent}}
   <script>
     $( document ).ready(function() {
       marked.setOptions({
@@ -133,12 +133,12 @@
     }
   </script>
   <style type="text/css">
-    {{>fonts}}
+    {{>fonts}}{{! prevent indent}}
 
-    {{>css_bootstrap}}
-    {{>css_prettify}}
+    {{>css_bootstrap}}{{! prevent indent}}
+    {{>css_prettify}}{{! prevent indent}}
 
-    {{>styles}}
+    {{>styles}}{{! prevent indent}}
   </style>
 </head>
 <body>
@@ -324,7 +324,7 @@
                                   <th>Description</th>
                                 </tr>
                                 {{#pathParams}}
-                                  {{>param}}
+                                  {{>param}}{{! prevent indent}}
                                 {{/pathParams}}
                             </table>
                           {{/hasPathParams}}
@@ -337,7 +337,7 @@
                                 <th>Description</th>
                               </tr>
                               {{#headerParams}}
-                                  {{>param}}
+                                  {{>param}}{{! prevent indent}}
                               {{/headerParams}}
                             </table>
                           {{/hasHeaderParams}}
@@ -350,7 +350,7 @@
                                 <th>Description</th>
                               </tr>
                               {{#bodyParams}}
-                                {{>paramB}}
+                                {{>paramB}}{{! prevent indent}}
                               {{/bodyParams}}
                             </table>
                           {{/hasBodyParam}}
@@ -363,7 +363,7 @@
                                 <th>Description</th>
                               </tr>
                               {{#formParams}}
-                                  {{>param}}
+                                  {{>param}}{{! prevent indent}}
                               {{/formParams}}
                             </table>
                           {{/hasFormParams}}
@@ -376,7 +376,7 @@
                                 <th>Description</th>
                               </tr>
                               {{#queryParams}}
-                                {{>param}}
+                                {{>param}}{{! prevent indent}}
                               {{/queryParams}}
                             </table>
                           {{/hasQueryParams}}
@@ -553,11 +553,11 @@
 {{/hideGenerationTimestamp}}      </div>
     </div>
   </div>
-  {{>js_jsonformatter}}
-  {{>js_jsonschemaview}}
-  {{>js_json_schema_ref_parser}}
-  {{>js_json_stringify_safe}}
-  {{>js_webfontloader}}
+  {{>js_jsonformatter}}{{! prevent indent}}
+  {{>js_jsonschemaview}}{{! prevent indent}}
+  {{>js_json_schema_ref_parser}}{{! prevent indent}}
+  {{>js_json_stringify_safe}}{{! prevent indent}}
+  {{>js_webfontloader}}{{! prevent indent}}
   <script>
     var schemaWrapper = { "components": { "schemas" : defs}};
     defsParser = new $RefParser();
diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache
index a69d7ebe84b3..cb95f69ccd6e 100644
--- a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache
@@ -3,6 +3,7 @@
  * @deprecated{{/isDeprecated}}
  */
 {{>additionalModelTypeAnnotations}}
+
 {{#description}}
 {{#isDeprecated}}
 @Deprecated
@@ -16,6 +17,7 @@
 {{/description}}
 {{#discriminator}}
 {{>typeInfoAnnotation}}
+
 {{/discriminator}}
 {{#jackson}}
 {{#isClassnameSanitized}}
@@ -26,8 +28,10 @@
 {{/jackson}}
 {{#withXml}}
 {{>xmlAnnotation}}
+
 {{/withXml}}
 {{>generatedAnnotation}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
@@ -41,10 +45,12 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -220,7 +226,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
   {{#useBeanValidation}}
-  {{>beanValidation}}
+  {{>beanValidation}}{{! prevent indent}}
   {{/useBeanValidation}}
   {{^useBeanValidation}}
   {{#required}}@NotNull{{/required}}
@@ -268,6 +274,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{! end feature: getter and setter }}
   {{/vars}}
 {{>additionalProperties}}
+
   {{^lombok.Data}}
   {{#parentVars}}
 
@@ -355,7 +362,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   }
   {{/lombok.ToString}}
   {{#generateBuilders}}
-  {{>javaBuilder}}
+  {{>javaBuilder}}{{! prevent indent}}
   {{/generateBuilders}}
   {{/lombok.Data}}
 }
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/JavaTimeFormatter.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/JavaTimeFormatter.mustache
index f3fb34e559cc..955acd071f5f 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/JavaTimeFormatter.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/JavaTimeFormatter.mustache
@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
 
     private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/StringUtil.mustache
index e3d5d6e90880..31af8371f5ed 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/StringUtil.mustache
@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/ApiKeyAuth.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/ApiKeyAuth.mustache
index 991ae2350035..8703bedd33cc 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/ApiKeyAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBasicAuth.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBasicAuth.mustache
index b5c72de6e7e9..be2863d628b3 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBasicAuth.mustache
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBearerAuth.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBearerAuth.mustache
index 322281f8716a..9027c5db68e2 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/auth/HttpBearerAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/model.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/model.mustache
index ad4e98b8a450..0af25e687b6d 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/model.mustache
@@ -11,9 +11,11 @@ import java.io.Serializable;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/pojo.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/pojo.mustache
index 54c9827d1429..5b9efcd13fba 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/pojo.mustache
@@ -21,6 +21,7 @@ import {{rootJavaEEPackage}}.json.bind.annotation.JsonbCreator;
  **/
 {{/description}}
 {{>additionalModelTypeAnnotations}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/JavaTimeFormatter.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/JavaTimeFormatter.mustache
index f3fb34e559cc..955acd071f5f 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/JavaTimeFormatter.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/JavaTimeFormatter.mustache
@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
 
     private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/StringUtil.mustache
index e3d5d6e90880..31af8371f5ed 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/StringUtil.mustache
@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/model.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/model.mustache
index ad4e98b8a450..0af25e687b6d 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/model.mustache
@@ -11,9 +11,11 @@ import java.io.Serializable;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pojo.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pojo.mustache
index 54c9827d1429..5b9efcd13fba 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pojo.mustache
@@ -21,6 +21,7 @@ import {{rootJavaEEPackage}}.json.bind.annotation.JsonbCreator;
  **/
 {{/description}}
 {{>additionalModelTypeAnnotations}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/common/model.mustache b/modules/openapi-generator/src/main/resources/java-helidon/common/model.mustache
index 00a3c3db1315..f94d934692a6 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/common/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/common/model.mustache
@@ -15,9 +15,11 @@ import {{rootJavaEEPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/common/pojo.mustache b/modules/openapi-generator/src/main/resources/java-helidon/common/pojo.mustache
index abc5e56ca789..e1c6a4353774 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/common/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/common/pojo.mustache
@@ -25,10 +25,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
 
         {{^isContainer}}
 {{>enumClass}}
+
         {{/isContainer}}
         {{#isContainer}}
             {{#mostInnerItems}}
 {{>enumClass}}
+
             {{/mostInnerItems}}
         {{/isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/JavaTimeFormatter.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/JavaTimeFormatter.mustache
index f3fb34e559cc..955acd071f5f 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/JavaTimeFormatter.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/JavaTimeFormatter.mustache
@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
 
     private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/StringUtil.mustache
index e3d5d6e90880..31af8371f5ed 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/StringUtil.mustache
@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/api.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/api.mustache
index 495b0cc7599e..846d0eb2bc3e 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/api.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/api.mustache
@@ -23,11 +23,13 @@ import {{rootJavaEEPackage}}.validation.Valid;{{/useBeanValidation}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}
+
 public {{^useAbstractClass}}interface{{/useAbstractClass}}{{#useAbstractClass}}abstract class{{/useAbstractClass}} {{classname}} {
 {{#operations}}
 {{#operation}}
 
 {{>apiAbstract}}
+
 {{/operation}}
 }
 {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/apiImpl.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/apiImpl.mustache
index 9c9db82b2496..0f102a61539e 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/apiImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/apiImpl.mustache
@@ -24,11 +24,13 @@ import {{rootJavaEEPackage}}.validation.Valid;{{/useBeanValidation}}
 @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 {{>generatedAnnotation}}
+
 public class {{classname}}Impl {{^useAbstractClass}}implements{{/useAbstractClass}}{{#useAbstractClass}}extends{{/useAbstractClass}} {{classname}} {
 {{#operations}}
 {{#operation}}
 
 {{>apiMethod}}
+
 {{/operation}}
 }
 {{/operations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/model.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/model.mustache
index 00a3c3db1315..f94d934692a6 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/model.mustache
@@ -15,9 +15,11 @@ import {{rootJavaEEPackage}}.validation.Valid;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/pojo.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/pojo.mustache
index a3310a0f0245..410628f2bc69 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/pojo.mustache
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
  **/
 {{/description}}
 {{>additionalModelTypeAnnotations}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/api.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/api.mustache
index 9c88def7bc96..8c7a4069156e 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/api.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/api.mustache
@@ -115,6 +115,7 @@ import io.helidon.webserver.{{^x-helidon-v3}}http.Http{{/x-helidon-v3}}Service;
 }}{{^x-helidon-v3}}
 {{#operation}}
 {{> opHelpers }}
+
 {{/operation}}
 {{/x-helidon-v3}}{{/useAbstractClass}}
 {{#useAbstractClass}}
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pojo.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pojo.mustache
index 13cc9493f30d..e5c598c4febd 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pojo.mustache
@@ -25,10 +25,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
 
         {{^isContainer}}
 {{>enumClass}}
+
         {{/isContainer}}
         {{#isContainer}}
             {{#mostInnerItems}}
 {{>enumClass}}
+
             {{/mostInnerItems}}
         {{/isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache
index 407f41007216..75fe9ab7a62a 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache
@@ -44,6 +44,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
     {{{.}}}
 {{/additionalClientTypeAnnotations}}
 {{>common/generatedAnnotation}}
+
 @Client({{#configureClientId}}
   id = "{{clientId}}",
   path = {{/configureClientId}}"${{openbrace}}{{{applicationName}}}{{basePathSeparator}}base-path{{closebrace}}")
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorization.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorization.mustache
index 6d3f706ffb57..e1964ccf968c 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorization.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorization.mustache
@@ -15,6 +15,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @Documented
 @Retention(RUNTIME)
 @Target(METHOD)
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationBinder.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationBinder.mustache
index 4b26586d84b4..ffc0d159fd8e 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationBinder.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationBinder.mustache
@@ -17,6 +17,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @Singleton
 public class AuthorizationBinder implements AnnotatedClientRequestBinder<Authorization> {
 
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache
index a52b4294c6f8..6bc263202d64 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache
@@ -37,6 +37,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @Filter({{#configureAuthFilterPattern}}"{{authorizationFilterPattern}}"{{/configureAuthFilterPattern}}{{^configureAuthFilterPattern}}Filter.MATCH_ALL_PATTERN{{/configureAuthFilterPattern}})
 public class AuthorizationFilter implements HttpClientFilter {
     private static final Logger LOG = LoggerFactory.getLogger(ClientCredentialsHttpClientFilter.class);
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorizations.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorizations.mustache
index 5cdd5363d75c..08661387cf4c 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorizations.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/Authorizations.mustache
@@ -12,6 +12,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @Documented
 @Retention(RUNTIME)
 @Target(METHOD)
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ApiKeyAuthConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ApiKeyAuthConfiguration.mustache
index 529019d44108..ecc997b68678 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ApiKeyAuthConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ApiKeyAuthConfiguration.mustache
@@ -11,6 +11,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @EachProperty("security.api-key-auth")
 public class ApiKeyAuthConfiguration implements ConfigurableAuthorization {
     private final String name;
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ConfigurableAuthorization.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ConfigurableAuthorization.mustache
index 968f3c9f7979..4c1570de2304 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ConfigurableAuthorization.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/ConfigurableAuthorization.mustache
@@ -7,6 +7,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 public interface ConfigurableAuthorization {
     String getName();
 
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/HttpBasicAuthConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/HttpBasicAuthConfiguration.mustache
index fae0b3f99515..d455628c5a05 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/HttpBasicAuthConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/configuration/HttpBasicAuthConfiguration.mustache
@@ -10,6 +10,7 @@ import {{javaxPackage}}.annotation.Generated;
 
 
 {{>common/generatedAnnotation}}
+
 @EachProperty("security.basic-auth")
 public class HttpBasicAuthConfiguration implements ConfigurableAuthorization {
     private final String name;
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache
index e98fd597002c..eb70581d36d2 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache
@@ -45,13 +45,16 @@ import io.swagger.v3.oas.annotations.media.Schema;
     {{#model}}
         {{#isEnum}}
 {{>common/model/modelEnum}}
+
         {{/isEnum}}
         {{^isEnum}}
             {{#vendorExtensions.x-is-one-of-interface}}
 {{>common/model/oneof_interface}}
+
             {{/vendorExtensions.x-is-one-of-interface}}
             {{^vendorExtensions.x-is-one-of-interface}}
 {{>common/model/pojo}}
+
             {{/vendorExtensions.x-is-one-of-interface}}
         {{/isEnum}}
     {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
index 2d05a31d1597..f445cb098ebd 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
@@ -39,10 +39,12 @@ Declare the class with extends and implements
         {{#isEnum}}
             {{^isContainer}}
 {{>common/model/modelInnerEnum}}
+
             {{/isContainer}}
             {{#isContainer}}
                 {{#mostInnerItems}}
 {{>common/model/modelInnerEnum}}
+
                 {{/mostInnerItems}}
             {{/isContainer}}
         {{/isEnum}}
@@ -211,6 +213,7 @@ Declare the class with extends and implements
 
         {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{>common/model/jackson_annotations}}
+
     public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
         return {{name}};
     }
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/server/controller.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/server/controller.mustache
index 5cd9e5b15b04..f626931c461b 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/server/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/server/controller.mustache
@@ -48,6 +48,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 {{/generateSwagger2Annotations}}
 
 {{>common/generatedAnnotation}}
+
 {{^generateControllerAsAbstract}}
 @Controller
 {{/generateControllerAsAbstract}}
@@ -89,7 +90,7 @@ public {{#generateControllerAsAbstract}}abstract {{/generateControllerAsAbstract
      * This method will be delegated to when the controller gets a request
      */
     public {{^generateOperationsToReturnNotImplemented}}abstract {{/generateOperationsToReturnNotImplemented}}{{>common/operationReturnType}} {{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}){{^generateOperationsToReturnNotImplemented}};{{/generateOperationsToReturnNotImplemented}}{{#generateOperationsToReturnNotImplemented}} {{openbrace}}
-    {{>server/controllerOperationBody}}
+    {{>server/controllerOperationBody}}{{! prevent indent}}
     {{closebrace}}{{/generateOperationsToReturnNotImplemented}}{{/generateControllerAsAbstract}}
     {{^-last}}
 
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache
index d4fcf5903fa9..fc338894cfa9 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache
@@ -4,6 +4,7 @@ package {{apiPackage}};
  * The exception that can be used to store the HTTP status code returned by an API response.
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends Exception {
     /** The HTTP status code. */
     private int code;
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache
index 05a79d8076bd..d4cdb1ff1485 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache
@@ -6,6 +6,7 @@ import {{javaxPackage}}.servlet.*;
 import {{javaxPackage}}.servlet.http.HttpServletResponse;
 
 {{>generatedAnnotation}}
+
 public class ApiOriginFilter implements {{javaxPackage}}.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache
index 446b6a1bb699..f2afe5a9991e 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache
@@ -4,6 +4,7 @@ import {{javaxPackage}}.xml.bind.annotation.XmlTransient;
 
 @{{javaxPackage}}.xml.bind.annotation.XmlRootElement
 {{>generatedAnnotation}}
+
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache
index 40c25c5ea5c4..998c25695790 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache
@@ -1,6 +1,7 @@
 package {{apiPackage}};
 
 {{>generatedAnnotation}}
+
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache
index 073966b0c217..b2832d12183c 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache
@@ -1,6 +1,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache
index 9bc9619520dd..ab03d878faec 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache
@@ -28,6 +28,7 @@ import {{javaxPackage}}.ws.rs.*;
 {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(description = "the {{baseName}} API")
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}  {
    private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache
index 8ecc1eaa5090..25ad835e71db 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache
@@ -18,6 +18,7 @@ import {{javaxPackage}}.ws.rs.core.Response;
 import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public abstract class {{classname}}Service {
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache
index 6df5ba2cb86c..717e963030d9 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache
@@ -18,6 +18,7 @@ import {{javaxPackage}}.ws.rs.core.Response;
 import {{javaxPackage}}.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}}ServiceImpl extends {{classname}}Service {
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache
index d52b90c8bec3..17c464bd0d61 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache
@@ -11,9 +11,11 @@ import java.io.Serializable;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
index 23e732d43d15..a9bd1c7e689b 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
@@ -8,10 +8,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
       {{#mostInnerItems}}
 {{>enumClass}}
+
       {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache
index f24464e8b3d0..9c230fb67fbe 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/api.mustache
@@ -37,6 +37,7 @@ import {{javaxPackage}}.validation.Valid;
  *
  */
 {{>generatedAnnotation}}
+
 @Api(value = "{{{baseName}}}", description = "the {{{baseName}}} API")
 {{#operations}}
 public interface {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache
index 70f94ba77721..c8caae1ded06 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache
@@ -41,6 +41,7 @@ import {{javaxPackage}}.validation.Valid;
  *
  */
 {{>generatedAnnotation}}
+
 @Controller
 {{#operations}}
 public class {{classname}}Controller implements {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/beanValidation.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/beanValidation.mustache
index 06199f2eb442..024f243807b4 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/beanValidation.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/beanValidation.mustache
@@ -4,3 +4,4 @@
   @Valid{{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}
   @Valid{{/isPrimitiveType}}{{/isContainer}}
 {{>beanValidationCore}}
+
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
index 2d287ef5e7cb..1ee9a925d6cb 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
@@ -30,9 +30,11 @@ import {{javaxPackage}}.xml.bind.annotation.*;
 {{#model}}
 {{#isEnum}}
 {{>enumOuterClass}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>pojo}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/notFoundException.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/notFoundException.mustache
index 40c25c5ea5c4..998c25695790 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/notFoundException.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/notFoundException.mustache
@@ -1,6 +1,7 @@
 package {{apiPackage}};
 
 {{>generatedAnnotation}}
+
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
index 39ba1ad15c61..687e552b9338 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
@@ -13,10 +13,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>enumClass}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>enumClass}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/julia-client/model.mustache b/modules/openapi-generator/src/main/resources/julia-client/model.mustache
index a6165354e583..2be6cfe00255 100644
--- a/modules/openapi-generator/src/main/resources/julia-client/model.mustache
+++ b/modules/openapi-generator/src/main/resources/julia-client/model.mustache
@@ -3,13 +3,18 @@
 {{#model}}
 {{#isAlias}}
 {{>partial_model_alias}}
+
 {{/isAlias}}{{^isAlias}}{{#oneOf}}{{#-first}}
 {{>partial_model_oneof}}
+
 {{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}
 {{>partial_model_anyof}}
+
 {{/-first}}{{/anyOf}}{{^anyOf}}{{#hasVars}}
 {{>partial_model_single}}
+
 {{/hasVars}}{{^hasVars}}
 {{>partial_model_alias}}
+
 {{/hasVars}}
 {{/anyOf}}{{/oneOf}}{{/isAlias}}{{/model}}{{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/julia-client/model_doc.mustache b/modules/openapi-generator/src/main/resources/julia-client/model_doc.mustache
index c5e99b3c513a..b01adff3343d 100644
--- a/modules/openapi-generator/src/main/resources/julia-client/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/julia-client/model_doc.mustache
@@ -2,8 +2,10 @@
 
 {{#oneOf}}{{#-first}}
 {{>partial_model_doc_oneof}}
+
 {{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}
 {{>partial_model_doc_anyof}}
+
 {{/-first}}{{/anyOf}}{{^anyOf}}
 ## Properties
 Name | Type | Description | Notes
diff --git a/modules/openapi-generator/src/main/resources/julia-server/model.mustache b/modules/openapi-generator/src/main/resources/julia-server/model.mustache
index a6165354e583..2be6cfe00255 100644
--- a/modules/openapi-generator/src/main/resources/julia-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/julia-server/model.mustache
@@ -3,13 +3,18 @@
 {{#model}}
 {{#isAlias}}
 {{>partial_model_alias}}
+
 {{/isAlias}}{{^isAlias}}{{#oneOf}}{{#-first}}
 {{>partial_model_oneof}}
+
 {{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}
 {{>partial_model_anyof}}
+
 {{/-first}}{{/anyOf}}{{^anyOf}}{{#hasVars}}
 {{>partial_model_single}}
+
 {{/hasVars}}{{^hasVars}}
 {{>partial_model_alias}}
+
 {{/hasVars}}
 {{/anyOf}}{{/oneOf}}{{/isAlias}}{{/model}}{{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/julia-server/model_doc.mustache b/modules/openapi-generator/src/main/resources/julia-server/model_doc.mustache
index c5e99b3c513a..b01adff3343d 100644
--- a/modules/openapi-generator/src/main/resources/julia-server/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/julia-server/model_doc.mustache
@@ -2,8 +2,10 @@
 
 {{#oneOf}}{{#-first}}
 {{>partial_model_doc_oneof}}
+
 {{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}
 {{>partial_model_doc_anyof}}
+
 {{/-first}}{{/anyOf}}{{^anyOf}}
 ## Properties
 Name | Type | Description | Notes
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache
index c3622ff6cd75..bf2a04d01d9b 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache
@@ -71,6 +71,7 @@ import java.io.IOException
 @Deprecated(message = "This schema is deprecated.")
 {{/isDeprecated}}
 {{>additionalModelTypeAnnotations}}
+
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}data class {{classname}}(var actualInstance: Any? = null) {
 
     class CustomTypeAdapterFactory : TypeAdapterFactory {
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index 1cc3e8d299c0..004f696bee0c 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -74,6 +74,7 @@ import {{packageName}}.infrastructure.ITransformForStorage
 @Deprecated(message = "This schema is deprecated.")
 {{/isDeprecated}}
 {{>additionalModelTypeAnnotations}}
+
 {{#vendorExtensions.x-class-extra-annotation}}
 {{{vendorExtensions.x-class-extra-annotation}}}
 {{/vendorExtensions.x-class-extra-annotation}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache
index 5c3fb1c77c26..3d2a5226e77b 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache
@@ -4,9 +4,11 @@ companion object Authentication {
     {{#authMethods}}
 {{#isApiKey}}
 {{>auth/apikeyauth}}
+
 {{/isApiKey}}
 {{#isBasicBasic}}
 {{>auth/httpbasicauth}}
+
 {{/isBasicBasic}}
 {{#isOAuth}}
     // TODO: Oauth not implemented yet - comment out below as OAuth does not exist
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
index a8fa5a6ca071..afcdc46747bd 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
@@ -15,7 +15,7 @@ import java.util.UUID
 {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}class RequestFactory(private val headerFactories : List<() -> Map<String, String>> = listOf(), private val postProcessors :List <(Request<*>) -> Unit> = listOf(), private val gsonAdapters: Map<Type, Any> = mapOf()): IRequestFactory {
 {{#hasAuthMethods}}
 
-   {{>auth/authentication}}
+   {{>auth/authentication}}{{! prevent indent}}
 {{/hasAuthMethods}}
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
index 157fb37601d9..a29af763c715 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
@@ -125,9 +125,11 @@ import kotlinx.serialization.encoding.*
 {{/hasBodyParam}}
 {{#isArray}}
 {{>serial_wrapper_response_list}}
+
 {{/isArray}}
 {{#isMap}}
 {{>serial_wrapper_response_map}}
+
 {{/isMap}}
 
     {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache
index 5a99b287f337..156ed8d269a3 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache
@@ -71,6 +71,7 @@ import java.io.IOException
 @Deprecated(message = "This schema is deprecated.")
 {{/isDeprecated}}
 {{>additionalModelTypeAnnotations}}
+
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}data class {{classname}}(var actualInstance: Any? = null) {
 
     {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}class CustomTypeAdapterFactory : TypeAdapterFactory {
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/api.mustache
index 4d42aaf5737a..6794c91ecd4f 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/api.mustache
@@ -20,6 +20,7 @@ import {{javaxPackage}}.validation.Valid{{/useBeanValidation}}
 @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}}
 @Path("/")
 {{>generatedAnnotation}}
+
 {{#interfaceOnly}}interface{{/interfaceOnly}}{{^interfaceOnly}}class{{/interfaceOnly}} {{classname}} {
 {{#operations}}
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/data_class.mustache
index 5fd73b908e8c..4c38bf64dccc 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/data_class.mustache
@@ -28,6 +28,7 @@ import java.io.Serializable
 @Deprecated(message = "This schema is deprecated.")
 {{/isDeprecated}}
 {{>additionalModelTypeAnnotations}}
+
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{#discriminator}}interface{{/discriminator}}{{^discriminator}}data class{{/discriminator}} {{classname}}{{^discriminator}} (
 
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/enum_class.mustache
index 8cd1d96e8d3d..d10f5fe452c3 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/enum_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/jaxrs-spec/enum_class.mustache
@@ -11,6 +11,7 @@ import kotlinx.serialization.Serializable
  */
 {{#kotlinx_serialization}}@Serializable{{/kotlinx_serialization}}
 {{>additionalModelTypeAnnotations}}
+
 {{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{classname}}(val value: {{{dataType}}}) {
 {{#allowableValues}}{{#enumVars}}
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/_api_body.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/_api_body.mustache
index b29afdb0adf2..54ddf9ed4fe9 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/_api_body.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/_api_body.mustache
@@ -1,5 +1,6 @@
 {{#hasAuthMethods}}
 {{>libraries/ktor/_principal}}
+
 {{#examples}}
 {{#-first}}
 {{#lambda.indented}}{{>_response}}{{/lambda.indented}}
@@ -13,6 +14,7 @@ call.respond(HttpStatusCode.NotImplemented)
 {{#examples}}
 {{#-first}}
 {{>libraries/ktor/_response}}
+
 {{/-first}}
 {{/examples}}
 {{^examples}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_api_body.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_api_body.mustache
index f5a368e589d9..3e19f8156999 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_api_body.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_api_body.mustache
@@ -1,5 +1,6 @@
 {{#hasAuthMethods}}
 {{>libraries/ktor2/_principal}}
+
 {{#examples}}
 {{#-first}}
 {{#lambda.indented}}{{>_response}}{{/lambda.indented}}
@@ -13,6 +14,7 @@ call.respond(HttpStatusCode.NotImplemented)
 {{#examples}}
 {{#-first}}
 {{>libraries/ktor2/_response}}
+
 {{/-first}}
 {{/examples}}
 {{^examples}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache
index 4d1af3ad52c2..e95db2d2c3d9 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache
@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping
 import java.util.Optional
 
 {{>generatedAnnotation}}
+
 @Controller{{#beanQualifiers}}("{{package}}.{{classname}}Controller"){{/beanQualifiers}}
 {{#useRequestMappingOnController}}
 {{=<% %>=}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache
index 916fc9d756c5..cb76cbcc7dda 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache
@@ -24,6 +24,7 @@ import java.util.concurrent.CompletableFuture
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
 {{>generatedAnnotation}}
+
 interface {{classname}}Delegate {
 
     fun getRequest(): Optional<NativeWebRequest> = Optional.empty()
@@ -34,7 +35,7 @@ interface {{classname}}Delegate {
      */
     {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}{{#isBodyParam}}Flow<{{{baseType}}}>{{/isBodyParam}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{/isArray}}{{/reactive}}{{^-last}},
         {{/-last}}{{/allParams}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^skipDefaultDelegateInterface}} {
-        {{>methodBody}}
+        {{>methodBody}}{{! prevent indent}}
     }{{/skipDefaultDelegateInterface}}
 
 {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache
index 63eeb81eea3d..deaebc86b808 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache
@@ -20,10 +20,10 @@
     ) {{/discriminator}}{{#parent}}: {{{.}}}{{#serializableModel}}, Serializable{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}: Serializable{{/serializableModel}}{{/parent}}{
 {{#discriminator}}
     {{#requiredVars}}
-        {{>interfaceReqVar}}
+        {{>interfaceReqVar}}{{! prevent indent}}
     {{/requiredVars}}
     {{#optionalVars}}
-        {{>interfaceOptVar}}
+        {{>interfaceOptVar}}{{! prevent indent}}
     {{/optionalVars}}
 {{/discriminator}}
 {{#hasEnums}}{{#vars}}{{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache
index f129a936c500..04a8fc236449 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache
@@ -17,6 +17,7 @@ import {{javaxPackage}}.servlet.ServletContext
 
 
 {{>generatedAnnotation}}
+
 @Configuration
 @EnableSwagger2
 class SpringFoxConfiguration {
diff --git a/modules/openapi-generator/src/main/resources/ktorm-schema/data_class.mustache b/modules/openapi-generator/src/main/resources/ktorm-schema/data_class.mustache
index e15a7b7a90c6..a527c576c297 100644
--- a/modules/openapi-generator/src/main/resources/ktorm-schema/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/ktorm-schema/data_class.mustache
@@ -61,6 +61,7 @@
 {{#allVars}}
 {{^isArray}}
 {{>data_class_set}}
+
 {{/isArray}}
 {{/allVars}}
         }
diff --git a/modules/openapi-generator/src/main/resources/lua/model.mustache b/modules/openapi-generator/src/main/resources/lua/model.mustache
index 154c055435a4..5ff1fa1d40ca 100644
--- a/modules/openapi-generator/src/main/resources/lua/model.mustache
+++ b/modules/openapi-generator/src/main/resources/lua/model.mustache
@@ -1,6 +1,7 @@
 {{#models}}
 {{#model}}
 {{>partial_header}}
+
 -- {{classname}} class
 local {{classname}} = {}
 local {{classname}}_mt = {
diff --git a/modules/openapi-generator/src/main/resources/objc/ApiClient-header.mustache b/modules/openapi-generator/src/main/resources/objc/ApiClient-header.mustache
index 573963770f80..8c53dfaec7a3 100644
--- a/modules/openapi-generator/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/ApiClient-header.mustache
@@ -5,6 +5,7 @@
 
 {{>licenceInfo}}
 
+
 /**
  * A key for `NSError` user info dictionaries.
  *
diff --git a/modules/openapi-generator/src/main/resources/objc/Configuration-protocol.mustache b/modules/openapi-generator/src/main/resources/objc/Configuration-protocol.mustache
index 946cc1bc2e5f..3d37bd2d5b4c 100644
--- a/modules/openapi-generator/src/main/resources/objc/Configuration-protocol.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/Configuration-protocol.mustache
@@ -4,6 +4,7 @@
 
 {{>licenceInfo}}
 
+
 static NSString * const k{{classPrefix}}APIVersion = @"{{podVersion}}";
 
 @protocol {{classPrefix}}Configuration <NSObject>
diff --git a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache
index f64bb5b0614a..3a196e9d9e28 100644
--- a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache
@@ -3,6 +3,7 @@
 
 {{>licenceInfo}}
 
+
 @class {{classPrefix}}ApiClient;
 
 @interface {{classPrefix}}DefaultConfiguration : NSObject <{{classPrefix}}Configuration>
diff --git a/modules/openapi-generator/src/main/resources/objc/JSONRequestSerializer-header.mustache b/modules/openapi-generator/src/main/resources/objc/JSONRequestSerializer-header.mustache
index 1259c5d15305..43066ba02099 100644
--- a/modules/openapi-generator/src/main/resources/objc/JSONRequestSerializer-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/JSONRequestSerializer-header.mustache
@@ -3,5 +3,6 @@
 
 {{>licenceInfo}}
 
+
 @interface {{classPrefix}}JSONRequestSerializer : AFJSONRequestSerializer
 @end
diff --git a/modules/openapi-generator/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache b/modules/openapi-generator/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
index f621e7184a99..d0a64fee6886 100644
--- a/modules/openapi-generator/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
@@ -3,6 +3,7 @@
 
 {{>licenceInfo}}
 
+
 @interface JSONValueTransformer (ISO8601)
 
 @end
diff --git a/modules/openapi-generator/src/main/resources/objc/Logger-header.mustache b/modules/openapi-generator/src/main/resources/objc/Logger-header.mustache
index 37afea41a097..5ae7d5ba615c 100644
--- a/modules/openapi-generator/src/main/resources/objc/Logger-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/Logger-header.mustache
@@ -2,6 +2,7 @@
 
 {{>licenceInfo}}
 
+
 #ifndef {{classPrefix}}DebugLogResponse
 #define {{classPrefix}}DebugLogResponse(response, responseObject,request, error) [[{{classPrefix}}Logger sharedLogger] logResponse:response responseObject:responseObject request:request error:error];
 #endif
diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache
index c15b84665e01..e79e66efce4c 100644
--- a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache
@@ -3,6 +3,7 @@
 
 {{>licenceInfo}}
 
+
 {{#imports}}#import "{{import}}ManagedObject.h"
 {{/imports}}
 {{newline}}
diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
index c21d30884486..f0dd9fc4e9c3 100644
--- a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
@@ -11,6 +11,7 @@
 
 {{>licenceInfo}}
 
+
 @interface {{classname}}ManagedObjectBuilder : NSObject
 
 {{#isArray}}@property (nonatomic, strong) {{arrayModelType}}ManagedObjectBuilder * entriesBuilder;{{/isArray}}{{#vars}}{{#complexType}}@property (nonatomic, strong) {{complexType}}ManagedObjectBuilder * {{name}}Builder;
diff --git a/modules/openapi-generator/src/main/resources/objc/Object-header.mustache b/modules/openapi-generator/src/main/resources/objc/Object-header.mustache
index 89da6a4d8b6c..a72f63311d60 100644
--- a/modules/openapi-generator/src/main/resources/objc/Object-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/Object-header.mustache
@@ -3,6 +3,7 @@
 
 {{>licenceInfo}}
 
+
 @interface {{classPrefix}}Object : JSONModel
 
 @end
diff --git a/modules/openapi-generator/src/main/resources/objc/QueryParamCollection-header.mustache b/modules/openapi-generator/src/main/resources/objc/QueryParamCollection-header.mustache
index 9729c182bd8a..e5ac0367f19e 100644
--- a/modules/openapi-generator/src/main/resources/objc/QueryParamCollection-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/QueryParamCollection-header.mustache
@@ -2,6 +2,7 @@
 
 {{>licenceInfo}}
 
+
 @interface {{classPrefix}}QueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
diff --git a/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache b/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache
index 3ee2ecbdb861..329a2b476cd4 100644
--- a/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache
@@ -2,6 +2,7 @@
 
 {{>licenceInfo}}
 
+
 /**
  * A key for deserialization ErrorDomain
  */
diff --git a/modules/openapi-generator/src/main/resources/objc/Sanitizer-header.mustache b/modules/openapi-generator/src/main/resources/objc/Sanitizer-header.mustache
index 4ad7f10a234c..e39829e94911 100644
--- a/modules/openapi-generator/src/main/resources/objc/Sanitizer-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/Sanitizer-header.mustache
@@ -2,6 +2,7 @@
 
 {{>licenceInfo}}
 
+
 extern NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string);
 
 extern NSString * const k{{classPrefix}}ApplicationJSONType;
diff --git a/modules/openapi-generator/src/main/resources/objc/api-header.mustache b/modules/openapi-generator/src/main/resources/objc/api-header.mustache
index e111cd1f752d..467ea5222dab 100644
--- a/modules/openapi-generator/src/main/resources/objc/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/api-header.mustache
@@ -6,6 +6,7 @@
 {{>licenceInfo}}
 
 
+
 @interface {{classname}}: NSObject <{{classPrefix}}Api>
 
 extern NSString* k{{classname}}ErrorDomain;
diff --git a/modules/openapi-generator/src/main/resources/objc/api-protocol.mustache b/modules/openapi-generator/src/main/resources/objc/api-protocol.mustache
index 5651150589ca..87fd24ff40de 100644
--- a/modules/openapi-generator/src/main/resources/objc/api-protocol.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/api-protocol.mustache
@@ -4,6 +4,7 @@
 
 {{>licenceInfo}}
 
+
 @protocol {{classPrefix}}Api <NSObject>
 
 @property(readonly, nonatomic, strong) {{classPrefix}}ApiClient *apiClient;
diff --git a/modules/openapi-generator/src/main/resources/objc/model-header.mustache b/modules/openapi-generator/src/main/resources/objc/model-header.mustache
index 639527db216c..bc58b0f91246 100644
--- a/modules/openapi-generator/src/main/resources/objc/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/model-header.mustache
@@ -3,6 +3,7 @@
 
 {{>licenceInfo}}
 
+
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 {{#imports}}
diff --git a/modules/openapi-generator/src/main/resources/perl/object.mustache b/modules/openapi-generator/src/main/resources/perl/object.mustache
index e67b07cfa328..b805395d22a2 100644
--- a/modules/openapi-generator/src/main/resources/perl/object.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/object.mustache
@@ -34,6 +34,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable"{{#allParents}}, "{{modul
 
 {{>BaseObject}}
 
+
 __PACKAGE__->class_documentation({description => '{{description}}',
                                   class => '{{classname}}',
                                   required => [], # TODO
diff --git a/modules/openapi-generator/src/main/resources/php-flight/api.mustache b/modules/openapi-generator/src/main/resources/php-flight/api.mustache
index 9824f8f8697d..c3e3ddea5e88 100644
--- a/modules/openapi-generator/src/main/resources/php-flight/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-flight/api.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 namespace {{apiPackage}};
 
 
diff --git a/modules/openapi-generator/src/main/resources/php-flight/model.mustache b/modules/openapi-generator/src/main/resources/php-flight/model.mustache
index c0fd08c25c56..b1f61861d64d 100644
--- a/modules/openapi-generator/src/main/resources/php-flight/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-flight/model.mustache
@@ -14,6 +14,7 @@
 
 {{>partial_header}}
 
+
 namespace {{modelPackage}};
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-flight/register_routes.mustache b/modules/openapi-generator/src/main/resources/php-flight/register_routes.mustache
index 75cb1de7bd55..4a95f539071b 100644
--- a/modules/openapi-generator/src/main/resources/php-flight/register_routes.mustache
+++ b/modules/openapi-generator/src/main/resources/php-flight/register_routes.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 namespace {{invokerPackage}};
 {{#apiInfo}}
 
diff --git a/modules/openapi-generator/src/main/resources/php-flight/register_routes_test.mustache b/modules/openapi-generator/src/main/resources/php-flight/register_routes_test.mustache
index cdb3e8cc265d..f4489584eeef 100644
--- a/modules/openapi-generator/src/main/resources/php-flight/register_routes_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-flight/register_routes_test.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 {{#apiInfo}}
 namespace {{testPackage}};
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/api_controller.mustache b/modules/openapi-generator/src/main/resources/php-laravel/api_controller.mustache
index f033a07e361e..0ae5062474ea 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/api_controller.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/api_controller.mustache
@@ -36,7 +36,7 @@ class {{controllerName}} extends Controller
      */
     public function {{operationId}}(Request $request{{#pathParams}}, {{dataType}} ${{paramName}}{{/pathParams}}): JsonResponse
     {
-        {{>api_validation}}
+        {{>api_validation}}{{! prevent indent}}
 
         {{#allParams}}
         {{^isPathParam}}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/model.mustache b/modules/openapi-generator/src/main/resources/php-laravel/model.mustache
index 59542125b415..2f826b0b86e2 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/model.mustache
@@ -15,9 +15,11 @@ namespace {{modelPackage}};
  */
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>model_generic}}
+
 {{/isEnum}}
 {{/model}}
 {{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php.mustache
index 50c438978093..c3a487af6272 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php.mustache
index e9bdb2eb578a..f405f40cab89 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Providers;
 
 use App\User;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php.mustache
index 7be121ca61c9..079d52fb8735 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Http\Middleware;
 
 use Closure;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Controller.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Controller.php.mustache
index 027132d26a99..02203a03f2aa 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Controller.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Controller.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Http\Controllers;
 
 use Laravel\Lumen\Routing\Controller as BaseController;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php.mustache
index e6d0dee03561..c681c6e51c94 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Event.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Event.php.mustache
index ad07b2c24154..4c43f2d61da8 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Event.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Event.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php.mustache
index 57f198622cb0..842f42f10089 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Providers;
 
 use Laravel\Lumen\Providers\EventServiceProvider as ServiceProvider;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php.mustache
index 81d1ff5190e9..b3ad45f37257 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Http\Controllers;
 
 class ExampleController extends Controller
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php.mustache
index cd3d462ebbac..ba3ac1a00fea 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Events;
 
 class ExampleEvent extends Event
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php.mustache
index 4ad285c71b49..6339c065b1aa 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Jobs;
 
 class ExampleJob extends Job
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php.mustache
index 93822950d783..4fc59effb743 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Listeners;
 
 use App\Events\ExampleEvent;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php.mustache
index 6d54e9f9918f..1aa0fa74bcfd 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Http\Middleware;
 
 use Closure;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php.mustache
index d258feaad33d..a2c86de57277 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 use Laravel\Lumen\Testing\DatabaseMigrations;
 use Laravel\Lumen\Testing\DatabaseTransactions;
 
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Handler.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Handler.php.mustache
index af1f860e3234..4d12add04ba6 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Handler.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Handler.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Exceptions;
 
 use Illuminate\Auth\Access\AuthorizationException;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Job.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Job.php.mustache
index 7c71ea4e7dea..df6f91509f8b 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Job.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Job.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Jobs;
 
 use Illuminate\Bus\Queueable;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/Kernel.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/Kernel.php.mustache
index a651f3a30d5c..d8202c630214 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/Kernel.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/Kernel.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php.mustache
index b1ab1efde7c3..01d506c8359d 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
 use App\User;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/TestCase.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/TestCase.php.mustache
index 7e40485e841b..f81f2b84fe74 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/TestCase.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/TestCase.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 use Laravel\Lumen\Testing\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/User.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/User.php.mustache
index 41f9806a2a1b..19bac0377da1 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/User.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/User.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 namespace App;
 
 use Illuminate\Auth\Authenticatable;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/api.mustache b/modules/openapi-generator/src/main/resources/php-lumen/api.mustache
index 5e1af4b23d34..faf9c58a75ac 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/api.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 namespace App\Http\Controllers;
 
 use Illuminate\Support\Facades\Request;
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/app.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/app.php.mustache
index 1a1d5bb493c7..e4823e0c1799 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/app.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/app.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 require_once __DIR__.'/../vendor/autoload.php';
 
 (new Laravel\Lumen\Bootstrap\LoadEnvironmentVariables(
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/artisan.mustache b/modules/openapi-generator/src/main/resources/php-lumen/artisan.mustache
index 46fb1b6f90ec..79b59205c12e 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/artisan.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/artisan.mustache
@@ -2,6 +2,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/index.php.mustache b/modules/openapi-generator/src/main/resources/php-lumen/index.php.mustache
index add2c7c07556..5aad0cae65e6 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/index.php.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/index.php.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>licenseInfoLumen}}
+
 /*
 |--------------------------------------------------------------------------
 | Create The Application
diff --git a/modules/openapi-generator/src/main/resources/php-lumen/routes.mustache b/modules/openapi-generator/src/main/resources/php-lumen/routes.mustache
index 9eed65e61b8f..0973c74b4be4 100644
--- a/modules/openapi-generator/src/main/resources/php-lumen/routes.mustache
+++ b/modules/openapi-generator/src/main/resources/php-lumen/routes.mustache
@@ -1,7 +1,9 @@
 <?php
 
 {{>licenseInfo}}
+
 {{>licenseInfoLumen}}
+
 {{#apiInfo}}/**
  * {{appName}}
  * @version {{appVersion}}
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/ApiException.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/ApiException.mustache
index 6720e351fb74..d6a3e8152d49 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/ApiException.mustache
@@ -9,6 +9,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache
index 4a5119de1d83..c55488301d49 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache
@@ -9,6 +9,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/FormDataProcessor.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/FormDataProcessor.mustache
index 4f73458ecf81..e5826830129f 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/FormDataProcessor.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/FormDataProcessor.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/HeaderSelector.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/HeaderSelector.mustache
index e8ae3e2d8102..c0fc8f599083 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/HeaderSelector.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/HeaderSelector.mustache
@@ -9,6 +9,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/ModelInterface.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/ModelInterface.mustache
index b8deccf36bb9..38267a45e5cf 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/ModelInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/ModelInterface.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache
index 32a77bef4bac..fa0589892fbe 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/README.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/README.mustache
index 8737c3d1bf3f..f9c27755bc67 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/README.mustache
@@ -53,6 +53,7 @@ require_once(__DIR__ . '/vendor/autoload.php');
 
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache
index 368faec4270a..2d9597cc9db7 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/api.mustache
@@ -9,6 +9,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api_doc.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api_doc.mustache
index db04fa56ce48..539b91cc7fff 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/api_doc.mustache
@@ -40,6 +40,7 @@ All URIs are relative to {{basePath}}, except if the operation defines another b
 require_once(__DIR__ . '/vendor/autoload.php');
 
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
index f7c4012624f2..a9aab8044a48 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
@@ -9,6 +9,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/model.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/model.mustache
index 323a21d03d9a..5805f76096c0 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/model.mustache
@@ -12,6 +12,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
index 4e6d79002dce..c3aad321d158 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
@@ -12,6 +12,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
index af20a1967045..55d527aa4809 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
index 83de70ff5c4c..466dc97ce100 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
index 5e9277f4c9c0..b05d0d84f102 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache
index a40df85841c9..842440c38c99 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache
index 6c182d5403cc..5110af013fc0 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
index 305ea12cf4c0..77d14f24da96 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
index 53f70127a776..52b3d6ce6f0d 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
index 2f01951a1300..e77d3c387ca4 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/register_dependencies.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/register_dependencies.mustache
index b1a9d3fa7dcd..50f6c42e58c1 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/register_dependencies.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/register_dependencies.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 declare(strict_types=1);
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/register_middlewares.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/register_middlewares.mustache
index b0f426764308..2a3bd8e71f33 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/register_middlewares.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/register_middlewares.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 declare(strict_types=1);
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/register_routes.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/register_routes.mustache
index 98d660c6c01b..fcf59e8aaf38 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/register_routes.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/register_routes.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 declare(strict_types=1);
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/response_emitter.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/response_emitter.mustache
index ba6c985cc96f..0f46e1360d67 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/response_emitter.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/response_emitter.mustache
@@ -2,6 +2,7 @@
 
 {{>licenseInfo}}
 
+
 declare(strict_types=1);
 
 /**
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache b/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache
index 8a5f472014a0..7e6ca5de4011 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache
index e8eacc33b2e3..6992022474df 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache
index 4a6ab902081f..c3efb19454bf 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache
index 4f6da923a6ac..82cb0268a8dc 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache
index 43914fe6728f..6f7b23300760 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache
index 50a77182c138..6064af923fa7 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
index 9dd5c4ef18ab..5f280270ca64 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
@@ -168,6 +169,7 @@ class {{controllerName}} extends Controller
         // Validate the input values
 {{>api_input_validation}}
 
+
         try {
             $handler = $this->getApiHandler();
 
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/autoload.mustache b/modules/openapi-generator/src/main/resources/php-symfony/autoload.mustache
index 0171bf4bd7f4..a8f96afa814c 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/autoload.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/autoload.mustache
@@ -1,6 +1,7 @@
 <?php
 
 {{>partial_header}}
+
 /**
  * An example of a project-specific implementation.
  *
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/model.mustache b/modules/openapi-generator/src/main/resources/php-symfony/model.mustache
index 2c796990ea33..83961816877a 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/model.mustache
@@ -13,6 +13,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache b/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache
index ac285dd0fca8..0258b084f807 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/api_test.mustache b/modules/openapi-generator/src/main/resources/php-symfony/testing/api_test.mustache
index 755fb72dba6a..e581a1f1a64f 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/testing/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/testing/api_test.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/model_test.mustache b/modules/openapi-generator/src/main/resources/php-symfony/testing/model_test.mustache
index 8dda6a8a60de..1f1059d8f9f8 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/testing/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/testing/model_test.mustache
@@ -13,6 +13,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
diff --git a/modules/openapi-generator/src/main/resources/php/ApiException.mustache b/modules/openapi-generator/src/main/resources/php/ApiException.mustache
index 285839e2ded7..178473e8d4bd 100644
--- a/modules/openapi-generator/src/main/resources/php/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ApiException.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/Configuration.mustache b/modules/openapi-generator/src/main/resources/php/Configuration.mustache
index 5f8159b6a285..df34eeec3f98 100644
--- a/modules/openapi-generator/src/main/resources/php/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/php/Configuration.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/FormDataProcessor.mustache b/modules/openapi-generator/src/main/resources/php/FormDataProcessor.mustache
index 6985fd6c573f..0ff4207c167e 100644
--- a/modules/openapi-generator/src/main/resources/php/FormDataProcessor.mustache
+++ b/modules/openapi-generator/src/main/resources/php/FormDataProcessor.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache b/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
index 1470695d3c23..d9dcdbbf4152 100644
--- a/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
+++ b/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache b/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
index 4b0def70a90d..3e008e7ce06c 100644
--- a/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
index 9bf66a48288f..779c750aeb12 100644
--- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
@@ -11,6 +11,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/README.mustache b/modules/openapi-generator/src/main/resources/php/README.mustache
index 31148a66a170..e4a17f15d17b 100644
--- a/modules/openapi-generator/src/main/resources/php/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php/README.mustache
@@ -53,6 +53,7 @@ require_once(__DIR__ . '/vendor/autoload.php');
 
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache
index a564a6220e7c..1a0e561f7a04 100644
--- a/modules/openapi-generator/src/main/resources/php/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/api_doc.mustache b/modules/openapi-generator/src/main/resources/php/api_doc.mustache
index db04fa56ce48..539b91cc7fff 100644
--- a/modules/openapi-generator/src/main/resources/php/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api_doc.mustache
@@ -40,6 +40,7 @@ All URIs are relative to {{basePath}}, except if the operation defines another b
 require_once(__DIR__ . '/vendor/autoload.php');
 
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
diff --git a/modules/openapi-generator/src/main/resources/php/api_test.mustache b/modules/openapi-generator/src/main/resources/php/api_test.mustache
index ac29c66fc7d2..00c747d41ecc 100644
--- a/modules/openapi-generator/src/main/resources/php/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api_test.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/ApiException.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/ApiException.mustache
index c3ea7ad7f5c2..c6741e2388bf 100644
--- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/ApiException.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/DebugPlugin.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/DebugPlugin.mustache
index cf256a130411..fd12920ed142 100644
--- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/DebugPlugin.mustache
+++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/DebugPlugin.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/README.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/README.mustache
index 40a12d592929..610ab3641c62 100644
--- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/README.mustache
@@ -65,6 +65,7 @@ require_once(__DIR__ . '/vendor/autoload.php');
 
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `Psr\Http\Client\ClientInterface`.
     // This is optional, `Psr18ClientDiscovery` will be used to find http client. For instance `GuzzleHttp\Client` implements that interface
diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api.mustache
index 727f0eb25c2e..f4277592c2d5 100644
--- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api.mustache
@@ -10,6 +10,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api_doc.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api_doc.mustache
index 3a794f7e5b4e..93e52e5956e4 100644
--- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/api_doc.mustache
@@ -26,6 +26,7 @@ Method | HTTP request | Description
 require_once(__DIR__ . '/vendor/autoload.php');
 
 {{> php_doc_auth_partial}}
+
 $apiInstance = new {{invokerPackage}}\Api\{{classname}}(
     // If you want use custom http client, pass your client which implements `Psr\Http\Client\ClientInterface`.
     // This is optional, `Psr18ClientDiscovery` will be used to find http client. For instance `GuzzleHttp\Client` implements that interface
diff --git a/modules/openapi-generator/src/main/resources/php/model.mustache b/modules/openapi-generator/src/main/resources/php/model.mustache
index b50114126bc7..edeaa7f8c781 100644
--- a/modules/openapi-generator/src/main/resources/php/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model.mustache
@@ -13,6 +13,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/php/model_test.mustache b/modules/openapi-generator/src/main/resources/php/model_test.mustache
index 6687753453cd..f8b3a5abc07f 100644
--- a/modules/openapi-generator/src/main/resources/php/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model_test.mustache
@@ -13,6 +13,7 @@
  */
 
 {{>partial_header}}
+
 /**
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/modules/openapi-generator/src/main/resources/powershell/model.mustache b/modules/openapi-generator/src/main/resources/powershell/model.mustache
index 9b81320e23ce..640ac15c05eb 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model.mustache
@@ -3,6 +3,7 @@
 {{#model}}
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}{{#-first}}{{>model_oneof}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>model_anyof}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>model_simple}}{{/anyOf}}{{/oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/main.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/main.mustache
index 7112b2719784..5b8c73388dd3 100644
--- a/modules/openapi-generator/src/main/resources/python-fastapi/main.mustache
+++ b/modules/openapi-generator/src/main/resources/python-fastapi/main.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 from fastapi import FastAPI
 
 {{#apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/model.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/model.mustache
index 84792dde1957..3ffd50e5773e 100644
--- a/modules/openapi-generator/src/main/resources/python-fastapi/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python-fastapi/model.mustache
@@ -2,10 +2,12 @@
 
 {{>partial_header}}
 
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}{{#-first}}{{>model_oneof}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>model_anyof}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>model_generic}}{{/anyOf}}{{/oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/model_test.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/model_test.mustache
index 9919e3d7a40c..8dec3b4ced42 100644
--- a/modules/openapi-generator/src/main/resources/python-fastapi/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python-fastapi/model_test.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import unittest
 import datetime
 
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/README.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/README.mustache
index bceb88f3b854..424335a54e94 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/README.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/README.mustache
@@ -58,3 +58,4 @@ Execute `pytest` to run the tests.
 Please follow the [installation procedure](#installation--usage) and then run the following:
 
 {{> common_README }}
+
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/README_onlypackage.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/README_onlypackage.mustache
index 99f8675c006e..e9bedf610cb3 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/README_onlypackage.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/README_onlypackage.mustache
@@ -43,3 +43,4 @@ In your own code, to use this library to connect and interact with {{{projectNam
 you can run the following:
 
 {{> common_README }}
+
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__model.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__model.mustache
index 0e1b55e2ace3..ce1a534837de 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__model.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__model.mustache
@@ -3,6 +3,7 @@
 # flake8: noqa
 {{>partial_header}}
 
+
 # import models into model package
 {{#models}}
 {{#model}}
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache
index 48c23c3578c7..1aaa9ef62d94 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/__init__package.mustache
@@ -4,6 +4,7 @@
 
 {{>partial_header}}
 
+
 __version__ = "{{packageVersion}}"
 
 # Define package exports
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api.mustache
index be804beec015..a0ad43b3d786 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import re  # noqa: F401
 import io
 import warnings
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_client.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_client.mustache
index e9a641479ba8..de8406407329 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_client.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import atexit
 import datetime
 from dateutil.parser import parse
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc.mustache
index 8fa3e4edb3a6..a58085cc33d5 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc.mustache
@@ -39,6 +39,7 @@ Method | HTTP request | Description
 {{/hasAuthMethods}}
 {{> api_doc_example }}
 
+
 ### Parameters
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
 Name | Type | Description  | Notes
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc_example.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc_example.mustache
index 15fbe332696a..87dbaff50dce 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc_example.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_doc_example.mustache
@@ -9,6 +9,7 @@ from {{{packageName}}}.rest import ApiException
 from pprint import pprint
 
 {{> python_doc_auth_partial}}
+
 # Enter a context with an instance of the API client
 {{#asyncio}}async {{/asyncio}}with {{{packageName}}}.ApiClient(configuration) as api_client:
     # Create an instance of the API class
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache
index a758be5210a7..759e6f81c844 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/api_test.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import unittest
 
 from {{apiPackage}}.{{classFilename}} import {{classname}}  # noqa: E501
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/asyncio/rest.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/asyncio/rest.mustache
index 9be766ce5771..be5ef872be49 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/asyncio/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/asyncio/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import logging
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/common_README.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/common_README.mustache
index 706d9b344b83..c2c09e5b8134 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/common_README.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/common_README.mustache
@@ -7,6 +7,7 @@ from pprint import pprint
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 {{> python_doc_auth_partial}}
 
+
 # Enter a context with an instance of the API client
 {{#asyncio}}async {{/asyncio}}with {{{packageName}}}.ApiClient(configuration) as api_client:
     # Create an instance of the API class
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/configuration.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/configuration.mustache
index c3799c0c5e0d..f074f48e98ff 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/configuration.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import copy
 import logging
 {{^asyncio}}
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/exceptions.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/exceptions.mustache
index 8a155a9fe08e..99a1f2e5ad8f 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/exceptions.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/exceptions.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
 
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/model.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/model.mustache
index 84792dde1957..3ffd50e5773e 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/model.mustache
@@ -2,10 +2,12 @@
 
 {{>partial_header}}
 
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}{{#-first}}{{>model_oneof}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>model_anyof}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>model_generic}}{{/anyOf}}{{/oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/model_test.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/model_test.mustache
index 2c7fa1f132cc..58035d9d01c4 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/model_test.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import unittest
 import datetime
 
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/rest.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/rest.mustache
index 845324e199b8..f83d5e33e2bd 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import logging
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/setup.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/setup.mustache
index 74ca2c17e8df..fed7c0b3eecd 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/setup.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/setup.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 from setuptools import setup, find_packages  # noqa: H301
 
 # To install the library, run the following
diff --git a/modules/openapi-generator/src/main/resources/python-pydantic-v1/tornado/rest.mustache b/modules/openapi-generator/src/main/resources/python-pydantic-v1/tornado/rest.mustache
index 6b91cdef986e..1d92443e7620 100644
--- a/modules/openapi-generator/src/main/resources/python-pydantic-v1/tornado/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python-pydantic-v1/tornado/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import logging
diff --git a/modules/openapi-generator/src/main/resources/python/README.mustache b/modules/openapi-generator/src/main/resources/python/README.mustache
index bceb88f3b854..424335a54e94 100644
--- a/modules/openapi-generator/src/main/resources/python/README.mustache
+++ b/modules/openapi-generator/src/main/resources/python/README.mustache
@@ -58,3 +58,4 @@ Execute `pytest` to run the tests.
 Please follow the [installation procedure](#installation--usage) and then run the following:
 
 {{> common_README }}
+
diff --git a/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache b/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache
index 56dadc84549c..f568369cbcc7 100644
--- a/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache
+++ b/modules/openapi-generator/src/main/resources/python/README_onlypackage.mustache
@@ -48,3 +48,4 @@ In your own code, to use this library to connect and interact with {{{projectNam
 you can run the following:
 
 {{> common_README }}
+
diff --git a/modules/openapi-generator/src/main/resources/python/__init__model.mustache b/modules/openapi-generator/src/main/resources/python/__init__model.mustache
index 0e1b55e2ace3..ce1a534837de 100644
--- a/modules/openapi-generator/src/main/resources/python/__init__model.mustache
+++ b/modules/openapi-generator/src/main/resources/python/__init__model.mustache
@@ -3,6 +3,7 @@
 # flake8: noqa
 {{>partial_header}}
 
+
 # import models into model package
 {{#models}}
 {{#model}}
diff --git a/modules/openapi-generator/src/main/resources/python/__init__package.mustache b/modules/openapi-generator/src/main/resources/python/__init__package.mustache
index 48c23c3578c7..1aaa9ef62d94 100644
--- a/modules/openapi-generator/src/main/resources/python/__init__package.mustache
+++ b/modules/openapi-generator/src/main/resources/python/__init__package.mustache
@@ -4,6 +4,7 @@
 
 {{>partial_header}}
 
+
 __version__ = "{{packageVersion}}"
 
 # Define package exports
diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache
index c1e166ba12a9..3e440e1fbade 100644
--- a/modules/openapi-generator/src/main/resources/python/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api.mustache
@@ -1,6 +1,7 @@
 # coding: utf-8
 
 {{>partial_header}}
+
 import warnings
 from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -33,6 +34,7 @@ class {{classname}}:
     @validate_call
     {{#asyncio}}async {{/asyncio}}def {{operationId}}{{>partial_api_args}} -> {{{returnType}}}{{^returnType}}None{{/returnType}}:
 {{>partial_api}}
+
         response_data = {{#asyncio}}await {{/asyncio}}self.api_client.call_api(
             *_param,
             _request_timeout=_request_timeout
@@ -47,6 +49,7 @@ class {{classname}}:
     @validate_call
     {{#asyncio}}async {{/asyncio}}def {{operationId}}_with_http_info{{>partial_api_args}} -> ApiResponse[{{{returnType}}}{{^returnType}}None{{/returnType}}]:
 {{>partial_api}}
+
         response_data = {{#asyncio}}await {{/asyncio}}self.api_client.call_api(
             *_param,
             _request_timeout=_request_timeout
@@ -61,6 +64,7 @@ class {{classname}}:
     @validate_call
     {{#asyncio}}async {{/asyncio}}def {{operationId}}_without_preload_content{{>partial_api_args}} -> RESTResponseType:
 {{>partial_api}}
+
         response_data = {{#asyncio}}await {{/asyncio}}self.api_client.call_api(
             *_param,
             _request_timeout=_request_timeout
diff --git a/modules/openapi-generator/src/main/resources/python/api_client.mustache b/modules/openapi-generator/src/main/resources/python/api_client.mustache
index 55dfdbe712a7..1f9c4d70062a 100644
--- a/modules/openapi-generator/src/main/resources/python/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_client.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import datetime
 from dateutil.parser import parse
 from enum import Enum
diff --git a/modules/openapi-generator/src/main/resources/python/api_doc.mustache b/modules/openapi-generator/src/main/resources/python/api_doc.mustache
index d20634ead4a7..8631cad3586d 100644
--- a/modules/openapi-generator/src/main/resources/python/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_doc.mustache
@@ -43,6 +43,7 @@ Method | HTTP request | Description
 {{/hasAuthMethods}}
 {{> api_doc_example }}
 
+
 ### Parameters
 
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
diff --git a/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache b/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache
index f5d7eef120ba..f6257e81dba1 100644
--- a/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache
@@ -8,6 +8,7 @@ from {{{packageName}}}.rest import ApiException
 from pprint import pprint
 
 {{> python_doc_auth_partial}}
+
 # Enter a context with an instance of the API client
 {{#asyncio}}async {{/asyncio}}with {{{packageName}}}.ApiClient(configuration) as api_client:
     # Create an instance of the API class
diff --git a/modules/openapi-generator/src/main/resources/python/api_test.mustache b/modules/openapi-generator/src/main/resources/python/api_test.mustache
index 2febe56956cf..f80a8fb16b9e 100644
--- a/modules/openapi-generator/src/main/resources/python/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_test.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import unittest
 
 from {{apiPackage}}.{{classFilename}} import {{classname}}
diff --git a/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache b/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache
index 937e76ed5a4c..599107e3c89a 100644
--- a/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python/asyncio/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import re
diff --git a/modules/openapi-generator/src/main/resources/python/common_README.mustache b/modules/openapi-generator/src/main/resources/python/common_README.mustache
index b7ce4615dfdf..8db0e56be018 100644
--- a/modules/openapi-generator/src/main/resources/python/common_README.mustache
+++ b/modules/openapi-generator/src/main/resources/python/common_README.mustache
@@ -6,6 +6,7 @@ from pprint import pprint
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 {{> python_doc_auth_partial}}
 
+
 # Enter a context with an instance of the API client
 {{#asyncio}}async {{/asyncio}}with {{{packageName}}}.ApiClient(configuration) as api_client:
     # Create an instance of the API class
diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache
index 0dca8be3583a..2601d75a0c89 100644
--- a/modules/openapi-generator/src/main/resources/python/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import copy
 import http.client as httplib
 import logging
diff --git a/modules/openapi-generator/src/main/resources/python/exceptions.mustache b/modules/openapi-generator/src/main/resources/python/exceptions.mustache
index fb2ebae0eefa..d6211b1a7fb9 100644
--- a/modules/openapi-generator/src/main/resources/python/exceptions.mustache
+++ b/modules/openapi-generator/src/main/resources/python/exceptions.mustache
@@ -1,6 +1,7 @@
 # coding: utf-8
 
 {{>partial_header}}
+
 from typing import Any, Optional
 from typing_extensions import Self
 
diff --git a/modules/openapi-generator/src/main/resources/python/model.mustache b/modules/openapi-generator/src/main/resources/python/model.mustache
index 84792dde1957..3ffd50e5773e 100644
--- a/modules/openapi-generator/src/main/resources/python/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model.mustache
@@ -2,10 +2,12 @@
 
 {{>partial_header}}
 
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{>model_enum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}{{#-first}}{{>model_oneof}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>model_anyof}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>model_generic}}{{/anyOf}}{{/oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/python/model_test.mustache b/modules/openapi-generator/src/main/resources/python/model_test.mustache
index 08088557cda6..a74c9aa02641 100644
--- a/modules/openapi-generator/src/main/resources/python/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model_test.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import unittest
 
 {{#models}}
diff --git a/modules/openapi-generator/src/main/resources/python/rest.mustache b/modules/openapi-generator/src/main/resources/python/rest.mustache
index f545066bb677..cd09f734135a 100644
--- a/modules/openapi-generator/src/main/resources/python/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import re
diff --git a/modules/openapi-generator/src/main/resources/python/setup.mustache b/modules/openapi-generator/src/main/resources/python/setup.mustache
index 93d1d6f9017d..cb1574274ec6 100644
--- a/modules/openapi-generator/src/main/resources/python/setup.mustache
+++ b/modules/openapi-generator/src/main/resources/python/setup.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 from setuptools import setup, find_packages  # noqa: H301
 
 # To install the library, run the following
diff --git a/modules/openapi-generator/src/main/resources/python/tornado/rest.mustache b/modules/openapi-generator/src/main/resources/python/tornado/rest.mustache
index f4bfbfb23242..753290f9be10 100644
--- a/modules/openapi-generator/src/main/resources/python/tornado/rest.mustache
+++ b/modules/openapi-generator/src/main/resources/python/tornado/rest.mustache
@@ -2,6 +2,7 @@
 
 {{>partial_header}}
 
+
 import io
 import json
 import re
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache
index 0493c6200fab..d15c8b54be64 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'cgi'
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
index 89fbba0e0865..192267217050 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'date'
@@ -48,12 +49,15 @@ module {{moduleName}}
 
 {{#isTyphoeus}}
 {{> api_client_typhoeus_partial}}
+
 {{/isTyphoeus}}
 {{#isFaraday}}
 {{> api_client_faraday_partial}}
+
 {{/isFaraday}}
 {{#isHttpx}}
 {{> api_client_httpx_partial}}
+
 {{/isHttpx}}
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_error.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_error.mustache
index 304d55db4bfd..38ee669a69ea 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/api_error.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/api_error.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 module {{moduleName}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache
index 7079f97e7706..90264f76a743 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'spec_helper'
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/configuration.mustache b/modules/openapi-generator/src/main/resources/ruby-client/configuration.mustache
index 6a03622a3187..463440ca3786 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/configuration.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 module {{moduleName}}
@@ -103,12 +104,15 @@ module {{moduleName}}
 
 {{#isTyphoeus}}
 {{> configuration_typhoeus_partial}}
+
 {{/isTyphoeus}}
 {{#isFaraday}}
 {{> configuration_faraday_partial}}
+
 {{/isFaraday}}
 {{#isHttpx}}
 {{> configuration_httpx_partial}}
+
 {{/isHttpx}}
 
     attr_accessor :inject_format
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache b/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
index c366da006f71..71daf07081ba 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 # Common files
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache b/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
index ea1cf2f77b8e..6cc0cff06ad5 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
@@ -2,6 +2,7 @@
 
 =begin
 {{> api_info}}
+
 =end
 
 $:.push File.expand_path("../lib", __FILE__)
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/model.mustache b/modules/openapi-generator/src/main/resources/ruby-client/model.mustache
index 64eea20eaee1..723dba82ffd4 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/model.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/model.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'date'
@@ -10,21 +11,25 @@ module {{moduleName}}
 {{#model}}
 {{#isEnum}}
 {{>partial_model_enum_class}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>partial_oneof_module}}
+
 {{/-first}}
 {{/oneOf}}
 {{#anyOf}}
 {{#-first}}
 {{>partial_anyof_module}}
+
 {{/-first}}
 {{/anyOf}}
 {{^oneOf}}
 {{^anyOf}}
 {{>partial_model_generic}}
+
 {{/anyOf}}
 {{/oneOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/model_doc.mustache b/modules/openapi-generator/src/main/resources/ruby-client/model_doc.mustache
index 37809685d1c0..6b4fb320f695 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/model_doc.mustache
@@ -3,10 +3,12 @@
 {{#oneOf}}
 {{#-first}}
 {{>partial_oneof_module_doc}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
 {{>partial_model_generic_doc}}
+
 {{/oneOf}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache b/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache
index 24f3a582f0dd..9db4abcb499b 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 require 'spec_helper'
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
index 930f3459a578..8b1762489a6b 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
@@ -396,4 +396,5 @@
     end
 
 {{> base_object}}
+
   end
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/spec_helper.mustache b/modules/openapi-generator/src/main/resources/ruby-client/spec_helper.mustache
index 8f4bb7541658..389dc3e1ce6c 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/spec_helper.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/spec_helper.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 # load the gem
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/version.mustache b/modules/openapi-generator/src/main/resources/ruby-client/version.mustache
index 3ed97bceab3c..2da45be29808 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/version.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/version.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> api_info}}
+
 =end
 
 module {{moduleName}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/controller.mustache b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/controller.mustache
index d4c44d54d26f..06a8abbf8296 100644
--- a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/controller.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> info}}
+
 =end
 class {{classname}} < ApplicationController
 {{#operations}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/migrate.mustache b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/migrate.mustache
index 7109887bde5a..c7e7f8b10768 100644
--- a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/migrate.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/migrate.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> info}}
+
 =end
 
 class InitTables < ActiveRecord::Migration
diff --git a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache
index acc10d640bd2..9449d3b4233c 100644
--- a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> info}}
+
 =end
 
 {{#models}}{{#model}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/routes.mustache b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/routes.mustache
index 5b8764cc7ca4..f50fe85b6e1c 100644
--- a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/routes.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/routes.mustache
@@ -1,5 +1,6 @@
 =begin
 {{> info}}
+
 =end
 Rails.application.routes.draw do
 
diff --git a/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache b/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache
index ad7d59fe064a..1221f4c2a7dc 100644
--- a/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache
@@ -10,6 +10,7 @@ use crate::{models, types::*};
 {{#operations}}
 {{#operation}}
 {{>response}}
+
 {{/operation}}
 {{/operations}}
 
diff --git a/modules/openapi-generator/src/main/resources/rust-axum/server-mod.mustache b/modules/openapi-generator/src/main/resources/rust-axum/server-mod.mustache
index 90662711827a..c609c46b7db7 100644
--- a/modules/openapi-generator/src/main/resources/rust-axum/server-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-axum/server-mod.mustache
@@ -1,14 +1,17 @@
 {{>server-imports}}
 
 {{>server-route}}
+
 {{#apiInfo}}
   {{#apis}}
     {{#operations}}
       {{#operation}}
 {{^disableValidator}}
 {{>server-operation-validate}}
+
 {{/disableValidator}}
 {{>server-operation}}
+
       {{/operation}}
     {{/operations}}
   {{/apis}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-callbacks.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-callbacks.mustache
index 44e16903d948..1c90bb188772 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-callbacks.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-callbacks.mustache
@@ -18,11 +18,14 @@ use crate::{{{operationId}}}Response;
 
 {{#callbacks}}
 {{>server-paths}}
+
 {{/callbacks}}
 
 {{>server-make-service}}
 
+
 {{>server-service-header}}
+
 {{#apiInfo}}
   {{#apis}}
     {{#operations}}
@@ -31,6 +34,7 @@ use crate::{{{operationId}}}Response;
           {{#urls}}
             {{#requests}}
 {{>server-operation}}
+
             {{/requests}}
           {{/urls}}
         {{/callbacks}}
@@ -44,6 +48,7 @@ use crate::{{{operationId}}}Response;
   {{/pathSet}}
 {{/callbacks}}
 {{>server-service-footer}}
+
 /// Request parser for `Api`.
 pub struct ApiRequestParser;
 impl<T> RequestParser<T> for ApiRequestParser {
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
index c49bdd656df7..17de9a94469a 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
@@ -353,6 +353,7 @@ impl<S, C> Api<C> for Client<S, C> where
     {{#operations}}
       {{#operation}}
 {{>client-operation}}
+
       {{/operation}}
     {{/operations}}
   {{/apis}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
index a5f96e3dbfaf..89d738db302c 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
@@ -86,6 +86,7 @@
                 Err(e) => return Err(ApiError(format!("Unable to create request: {}", e)))
         };
 {{>client-request-body-instance}}
+
         let header = HeaderValue::from_str(Has::<XSpanIdString>::get(context).0.as_str());
         request.headers_mut().insert(HeaderName::from_static("x-span-id"), match header {
             Ok(h) => h,
@@ -214,6 +215,7 @@
 
 {{>client-response-body-instance}}
 
+
                 Ok({{{operationId}}}Response::{{#vendorExtensions}}{{x-response-id}}{{/vendorExtensions}}
 {{^headers}}
                     (body)
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache
index f0f265a29d1d..02dffa01092e 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-request-body-instance.mustache
@@ -3,12 +3,14 @@
 
         // Consumes multipart/form body
 {{>client-request-body-multipart-form}}
+
   {{/x-consumes-multipart-form}}
   {{#x-consumes-multipart-related}}
 
         // Consumes multipart/related body
     {{#formParams}}
 {{>generate-multipart-related}}
+
     {{/formParams}}
 
         let header = "multipart/related";
diff --git a/modules/openapi-generator/src/main/resources/rust-server/example-client-server.mustache b/modules/openapi-generator/src/main/resources/rust-server/example-client-server.mustache
index 126af4cf7471..8dcc257086ca 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/example-client-server.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/example-client-server.mustache
@@ -30,6 +30,7 @@ impl<C> CallbackApi<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
           {{#urls}}
             {{#requests}}
 {{>example-server-operation}}
+
             {{/requests}}
           {{/urls}}
         {{/callbacks}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/example-server-server.mustache b/modules/openapi-generator/src/main/resources/rust-server/example-server-server.mustache
index bfa094f523c2..d52d90d8d1de 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/example-server-server.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/example-server-server.mustache
@@ -30,6 +30,7 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     {{#operations}}
       {{#operation}}
 {{>example-server-operation}}
+
       {{/operation}}
     {{/operations}}
   {{/apis}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
index e6d2bf190130..c791d2602b76 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
@@ -27,6 +27,7 @@ pub use auth::{AuthenticationApi, Claims};
     {{#operations}}
       {{#operation}}
 {{>response}}
+
       {{/operation}}
     {{/operations}}
   {{/apis}}
@@ -145,6 +146,7 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
             {{#urls}}
               {{#requests}}
 {{>response}}
+
             {{/requests}}
           {{/urls}}
         {{/callbacks}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
index 2c95e530895d..8017f836067f 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
@@ -214,6 +214,7 @@ impl<S, C> CallbackApi<C> for Client<S, C> where
           {{#urls}}
             {{#requests}}
 {{>client-operation}}
+
             {{/requests}}
           {{/urls}}
         {{/callbacks}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
index 4111630d6e3f..987def153a0b 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
@@ -10,13 +10,17 @@ pub mod callbacks;
 
 {{/hasCallbacks}}
 {{>server-paths}}
+
 {{>server-make-service}}
+
 {{>server-service-header}}
+
 {{#apiInfo}}
   {{#apis}}
     {{#operations}}
       {{#operation}}
 {{>server-operation}}
+
       {{/operation}}
     {{/operations}}
   {{/apis}}
@@ -25,6 +29,7 @@ pub mod callbacks;
             _ if path.matched(paths::ID_{{PATH_ID}}) => method_not_allowed(),
 {{/pathSet}}
 {{>server-service-footer}}
+
 /// Request parser for `Api`.
 pub struct ApiRequestParser;
 impl<T> RequestParser<T> for ApiRequestParser {
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
index 4957b65c4dc5..572a414972e9 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
@@ -207,6 +207,7 @@
     {{/vendorExtensions.x-consumes-form}}
   {{/vendorExtensions.x-consumes-multipart-form}}
 {{>server-request-body-instance}}
+
 {{/vendorExtensions.x-has-request-body}}
                                 let result = api_impl.{{#vendorExtensions}}{{{x-operation-id}}}{{/vendorExtensions}}(
                                         {{#vendorExtensions}}
@@ -295,6 +296,7 @@
   {{/required}}
 {{/headers}}
 {{>server-response-body-instance}}
+
                                                 },
 {{/responses}}
                                             },
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-request-body-instance.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-request-body-instance.mustache
index 4fea15ea52c3..79190dc439cb 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-request-body-instance.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-request-body-instance.mustache
@@ -2,19 +2,23 @@
   {{#x-consumes-multipart}}
     {{#x-consumes-multipart-related}}
 {{>server-request-body-multipart-related}}
+
     {{/x-consumes-multipart-related}}
     {{^x-consumes-multipart-related}}
       {{^bodyParams}}
 {{>server-request-body-multipart-form}}
+
       {{/bodyParams}}
     {{/x-consumes-multipart-related}}
   {{/x-consumes-multipart}}
   {{^x-consumes-multipart}}
     {{#bodyParams}}
 {{>server-request-body-basic}}
+
     {{/bodyParams}}
     {{^bodyParams}}
 {{>server-request-body-form}}
+
     {{/bodyParams}}
   {{/x-consumes-multipart}}
 {{/vendorExtensions}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-response-body-instance.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-response-body-instance.mustache
index 9bb648c525f7..4a5fa7b1c766 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-response-body-instance.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-response-body-instance.mustache
@@ -38,6 +38,7 @@
       {{/formParams}}
       {{#formParams}}
 {{>generate-multipart-related}}
+
                                                     let header = "multipart/related";
                                                     response.headers_mut().insert(CONTENT_TYPE,
                                                         HeaderValue::from_bytes(
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/api.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/api.mustache
index 6da068e37a58..012d14e51c17 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-client/api.mustache
@@ -19,6 +19,7 @@ class {{classname}}(baseUrl: String) {
 {{#operation}}
 {{#javadocRenderer}}
 {{>javadoc}}
+
 {{/javadocRenderer}}
   def {{operationId}}({{>methodParameters}}): ApiRequest[{{>operationReturnType}}] =
     ApiRequest[{{>operationReturnType}}](ApiMethods.{{httpMethod.toUpperCase}}, baseUrl, "{{{path}}}", {{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}})
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/model_doc.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/model_doc.mustache
index e1025787793c..93bd7e927ab2 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-client/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-client/model_doc.mustache
@@ -2,8 +2,10 @@
 
 {{#isEnum}}
 {{>enum_doc}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>class_doc}}
+
 {{/isEnum}}
 {{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache b/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache
index b2167d0cd530..c5a8b099506f 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/apiRoutes.mustache
@@ -3,6 +3,7 @@
 //> using lib "com.lihaoyi::scalatags:0.12.0"
 {{>licenseInfo}}
 
+
 // this is generated from apiRoutes.mustache
 package {{apiPackage}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/apiService.mustache b/modules/openapi-generator/src/main/resources/scala-cask/apiService.mustache
index 3ba0f0e50f9d..cfa82eb4d545 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/apiService.mustache
@@ -3,6 +3,7 @@
 //> using lib "com.lihaoyi::scalatags:0.12.0"
 {{>licenseInfo}}
 
+
 // generated from apiService.mustache
 package {{apiPackage}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/appRoutes.mustache b/modules/openapi-generator/src/main/resources/scala-cask/appRoutes.mustache
index 09f640f7a93f..3778bbae63e0 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/appRoutes.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/appRoutes.mustache
@@ -2,6 +2,7 @@
 //> using lib "com.lihaoyi::cask:0.9.2"
 //> using lib "com.lihaoyi::scalatags:0.8.2"
 {{>licenseInfo}}
+
 // this file was generated from app.mustache
 package {{packageName}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/baseApp.mustache b/modules/openapi-generator/src/main/resources/scala-cask/baseApp.mustache
index 5e0eca0ed764..85744c5f1678 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/baseApp.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/baseApp.mustache
@@ -3,6 +3,7 @@
 //> using lib "com.lihaoyi::scalatags:0.8.2"
 {{>licenseInfo}}
 
+
 // this file was generated from app.mustache
 package {{packageName}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/exampleApp.mustache b/modules/openapi-generator/src/main/resources/scala-cask/exampleApp.mustache
index 827206a040ca..79887ff4d49a 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/exampleApp.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/exampleApp.mustache
@@ -3,6 +3,7 @@
 //> using dep "com.lihaoyi::scalatags:0.8.2"
 {{>licenseInfo}}
 
+
 // this file was generated from app.mustache
 package {{packageName}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/model.mustache b/modules/openapi-generator/src/main/resources/scala-cask/model.mustache
index 31b487598775..8f5ceaa0508d 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/model.mustache
@@ -24,10 +24,10 @@ object {{{classname}}} {
 {{/vendorExtensions.x-has-one-of}}
 {{^vendorExtensions.x-has-one-of}}
     {{#isEnum}}
-        {{>modelEnum}}
+        {{>modelEnum}}{{! prevent indent}}
     {{/isEnum}}
     {{^isEnum}}
-        {{>modelClass}}
+        {{>modelClass}}{{! prevent indent}}
     {{/isEnum}}
 {{/vendorExtensions.x-has-one-of}}
 
diff --git a/modules/openapi-generator/src/main/resources/scala-cask/modelData.mustache b/modules/openapi-generator/src/main/resources/scala-cask/modelData.mustache
index 91c580352a19..e37fd9a8c226 100644
--- a/modules/openapi-generator/src/main/resources/scala-cask/modelData.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-cask/modelData.mustache
@@ -42,10 +42,10 @@ object {{{classname}}}Data {
 {{/vendorExtensions.x-has-one-of}}
 {{^vendorExtensions.x-has-one-of}}
     {{#isEnum}}
-        {{>modelDataEnum}}
+        {{>modelDataEnum}}{{! prevent indent}}
     {{/isEnum}}
     {{^isEnum}}
-        {{>modelDataClass}}
+        {{>modelDataClass}}{{! prevent indent}}
     {{/isEnum}}
 {{/vendorExtensions.x-has-one-of}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/scala-http4s-server/api.mustache b/modules/openapi-generator/src/main/resources/scala-http4s-server/api.mustache
index 2cb353b03c63..03180e916c5d 100644
--- a/modules/openapi-generator/src/main/resources/scala-http4s-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-http4s-server/api.mustache
@@ -58,17 +58,17 @@ final case class {{classname}}Routes[
       {{#vendorExtensions.x-generic-body}}
       req.contentType match {
         case Some(`Content-Type`(MediaType.application.json, _)) =>
-          {{>delegateCallJson}}
+          {{>delegateCallJson}}{{! prevent indent}}
         case _ =>
-          {{>delegateCallGeneric}}
+          {{>delegateCallGeneric}}{{! prevent indent}}
       }
       {{/vendorExtensions.x-generic-body}}
       {{^vendorExtensions.x-generic-body}}
-        {{>delegateCallJson}}
+        {{>delegateCallJson}}{{! prevent indent}}
       {{/vendorExtensions.x-generic-body}}
       {{/vendorExtensions.x-json-body}}
       {{^vendorExtensions.x-json-body}}
-        {{>delegateCallGeneric}}
+        {{>delegateCallGeneric}}{{! prevent indent}}
       {{/vendorExtensions.x-json-body}}
     }
 
@@ -80,17 +80,17 @@ final case class {{classname}}Routes[
       {{#vendorExtensions.x-generic-body}}
       req.contentType match {
         case Some(`Content-Type`(MediaType.application.json, _)) =>
-          {{>delegateCallJson}}
+          {{>delegateCallJson}}{{! prevent indent}}
         case _ =>
-          {{>delegateCallGeneric}}
+          {{>delegateCallGeneric}}{{! prevent indent}}
       }
       {{/vendorExtensions.x-generic-body}}
       {{^vendorExtensions.x-generic-body}}
-        {{>delegateCallJson}}
+        {{>delegateCallJson}}{{! prevent indent}}
       {{/vendorExtensions.x-generic-body}}
       {{/vendorExtensions.x-json-body}}
       {{^vendorExtensions.x-json-body}}
-        {{>delegateCallGeneric}}
+        {{>delegateCallGeneric}}{{! prevent indent}}
       {{/vendorExtensions.x-json-body}}
     }
 {{/vendorExtensions.x-authed}}
diff --git a/modules/openapi-generator/src/main/resources/scala-http4s/api.mustache b/modules/openapi-generator/src/main/resources/scala-http4s/api.mustache
index a0bf72123d07..9f4d5b899c7f 100644
--- a/modules/openapi-generator/src/main/resources/scala-http4s/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-http4s/api.mustache
@@ -49,7 +49,7 @@ class {{classname}}EndpointsImpl[F[*]: Concurrent](
       queryParameters = {{^hasQueryParams}}Nil,{{/hasQueryParams}}{{#hasQueryParams}}queryParameters,{{/hasQueryParams}}
       requestHeaders = requestHeaders,
       auth = {{#authMethods.0}}Some(auth){{/authMethods.0}}{{^authMethods}}None{{/authMethods}}) {
-        {{>responseState}}
+        {{>responseState}}{{! prevent indent}}
     }
   }
 
diff --git a/modules/openapi-generator/src/main/resources/scala-pekko-client/api.mustache b/modules/openapi-generator/src/main/resources/scala-pekko-client/api.mustache
index 6da068e37a58..012d14e51c17 100644
--- a/modules/openapi-generator/src/main/resources/scala-pekko-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-pekko-client/api.mustache
@@ -19,6 +19,7 @@ class {{classname}}(baseUrl: String) {
 {{#operation}}
 {{#javadocRenderer}}
 {{>javadoc}}
+
 {{/javadocRenderer}}
   def {{operationId}}({{>methodParameters}}): ApiRequest[{{>operationReturnType}}] =
     ApiRequest[{{>operationReturnType}}](ApiMethods.{{httpMethod.toUpperCase}}, baseUrl, "{{{path}}}", {{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}})
diff --git a/modules/openapi-generator/src/main/resources/scala-pekko-client/model_doc.mustache b/modules/openapi-generator/src/main/resources/scala-pekko-client/model_doc.mustache
index e1025787793c..93bd7e927ab2 100644
--- a/modules/openapi-generator/src/main/resources/scala-pekko-client/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-pekko-client/model_doc.mustache
@@ -2,8 +2,10 @@
 
 {{#isEnum}}
 {{>enum_doc}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{>class_doc}}
+
 {{/isEnum}}
 {{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache
index 7ee772ebfd88..c19e2aa16fa6 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiController.scala.mustache
@@ -15,6 +15,7 @@ import {{import}}
 {{#operations}}
 
 {{>generatedAnnotation}}
+
 @Singleton
 class {{classname}}Controller @Inject()(cc: ControllerComponents, api: {{classname}}){{#supportAsync}}(implicit executionContext: ExecutionContext){{/supportAsync}} extends AbstractController(cc) {
   {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache
index 6a5f17b20986..945b3e9b7add 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiImplStubs.scala.mustache
@@ -12,6 +12,7 @@ import {{import}}
   * Provides a default implementation for [[{{classname}}]].
   */
 {{>generatedAnnotation}}
+
 class {{classname}}Impl extends {{classname}} {
 {{#operation}}
   /**
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache
index de5b9e1e2a2d..6628d8da8d13 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/app/apiTrait.scala.mustache
@@ -10,6 +10,7 @@ import {{import}}
 {{#operations}}
 
 {{>generatedAnnotation}}
+
 trait {{classname}} {
 {{#operation}}
   /**
@@ -25,7 +26,7 @@ trait {{classname}} {
     {{/description}}
     {{/allParams}}
     */
-  {{>app/defOperationSignature}}
+  {{>app/defOperationSignature}}{{! prevent indent}}
 {{^-last}}
 
 {{/-last}}
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache
index 0883ae3dbdbd..6726cbb87700 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/app/module.scala.mustache
@@ -5,6 +5,7 @@ import play.api.inject.{Binding, Module => PlayModule}
 import play.api.{Configuration, Environment}
 
 {{>generatedAnnotation}}
+
 class Module extends PlayModule {
   override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = Seq(
     {{#apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache
index 8b633bc22dd5..76c8499de384 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/extensibleObjectJsonFormat.mustache
@@ -22,4 +22,5 @@ Format(
   }
 ){{/hasVars}}{{^hasVars}}
 {{>simpleParentJsonFormat}}
+
 {{/hasVars}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache
index 61fc0fe3a9d8..a6f6d3d0cbde 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache
@@ -18,11 +18,14 @@ import {{import}}
   {{/isMap}}
   */
 {{>generatedAnnotation}}
+
 {{^isArray}}
 {{>caseClass}}
+
 {{/isArray}}
 {{#isArray}}
 {{>arrayCaseClass}}
+
 {{/isArray}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
index cb72041f6a4f..03f3d0b1d851 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
@@ -18,6 +18,7 @@ class {{classname}}(baseUrl: String) {
 {{#operation}}
 {{#javadocRenderer}}
 {{>javadoc}}
+
 {{/javadocRenderer}}
   def {{operationId}}({{>methodParameters}}): Request[{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}, Any] =
     basicRequest
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp4/api.mustache b/modules/openapi-generator/src/main/resources/scala-sttp4/api.mustache
index 1635d5bd1c15..bf2c67d0501f 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp4/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp4/api.mustache
@@ -18,6 +18,7 @@ class {{classname}}(baseUrl: String) {
 {{#operation}}
 {{#javadocRenderer}}
 {{>javadoc}}
+
 {{/javadocRenderer}}
   def {{operationId}}({{>methodParameters}}): Request[{{#separateErrorChannel}}Either[ResponseException[String, Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}] =
     basicRequest
diff --git a/modules/openapi-generator/src/main/resources/scalatra/api.mustache b/modules/openapi-generator/src/main/resources/scalatra/api.mustache
index 9a89e30c1a22..67df08db7ff8 100644
--- a/modules/openapi-generator/src/main/resources/scalatra/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scalatra/api.mustache
@@ -47,16 +47,16 @@ class {{classname}}(implicit val swagger: Swagger) extends ScalatraServlet
     val {{paramName}} = params.getOrElse("{{paramName}}", halt(400))
     {{/isPathParam}}
     {{#isQueryParam}}
-    {{>queryParamOperation}}
+    {{>queryParamOperation}}{{! prevent indent}}
     {{/isQueryParam}}
     {{#isHeaderParam}}
-    {{>headerParamOperation}}
+    {{>headerParamOperation}}{{! prevent indent}}
     {{/isHeaderParam}}
     {{#isFormParams}}
-    {{>formParamOperation}}
+    {{>formParamOperation}}{{! prevent indent}}
     {{/isFormParams}}
     {{#isBodyParams}}
-    {{>bodyParamOperation}}
+    {{>bodyParamOperation}}{{! prevent indent}}
     {{/isBodyParams}}
     {{/isFile}}
     //println("{{paramName}}: " + {{paramName}})
diff --git a/modules/openapi-generator/src/main/resources/scalaz/api.mustache b/modules/openapi-generator/src/main/resources/scalaz/api.mustache
index 9a7edf6360e7..906d67a5413b 100644
--- a/modules/openapi-generator/src/main/resources/scalaz/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scalaz/api.mustache
@@ -48,7 +48,7 @@ object {{classname}} {
       uri           <- Task.fromDisjunction(Uri.fromString(host + path))
       uriWithParams =  uri.copy(query = queryParams)
       req           =  Request(method = httpMethod, uri = uriWithParams, headers = headers.put(contentType)){{#bodyParam}}.withBody({{paramName}}){{/bodyParam}}
-      {{>clientFunction}}
+      {{>clientFunction}}{{! prevent indent}}
     } yield resp
   }
 
@@ -77,7 +77,7 @@ class HttpService{{classname}}(service: HttpService) {
       uri           <- Task.fromDisjunction(Uri.fromString(path))
       uriWithParams =  uri.copy(query = queryParams)
       req           =  Request(method = httpMethod, uri = uriWithParams, headers = headers.put(contentType)){{#bodyParam}}.withBody({{paramName}}){{/bodyParam}}
-      {{>clientFunction}}
+      {{>clientFunction}}{{! prevent indent}}
     } yield resp
   }
 
diff --git a/modules/openapi-generator/src/main/resources/swift-combine/api.mustache b/modules/openapi-generator/src/main/resources/swift-combine/api.mustache
index 187ab989a8d9..63fa4a456663 100644
--- a/modules/openapi-generator/src/main/resources/swift-combine/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift-combine/api.mustache
@@ -148,6 +148,7 @@ open class {{classname}} {
                 var multipartData = Data()
                 {{#formParams}}
 {{> toMultipartFormDataAppend}}
+
                 {{/formParams}}
                 multipartData.append("\r\n--\(multipartBoundary)--\r\n".data(using: .utf8) ?? Data())
                 request.httpBody = multipartData
diff --git a/modules/openapi-generator/src/main/resources/swift-combine/model.mustache b/modules/openapi-generator/src/main/resources/swift-combine/model.mustache
index 02ec0fe4eb13..ffec08c590a3 100644
--- a/modules/openapi-generator/src/main/resources/swift-combine/model.mustache
+++ b/modules/openapi-generator/src/main/resources/swift-combine/model.mustache
@@ -12,21 +12,26 @@ import Foundation
 {{/description}}
 {{#vendorExtensions.x-is-one-of-interface}}
 {{> modelOneOf}}
+
 {{/vendorExtensions.x-is-one-of-interface}}
 {{^vendorExtensions.x-is-one-of-interface}}
 {{#isArray}}
 {{> modelArray}}
+
 {{/isArray}}
 {{^isArray}}
 {{#isEnum}}
 {{> modelEnum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#vendorExtensions.x-swift-contains-not-codable}}
 {{> modelObjectCustom}}
+
 {{/vendorExtensions.x-swift-contains-not-codable}}
 {{^vendorExtensions.x-swift-contains-not-codable}}
 {{> modelObject}}
+
 {{/vendorExtensions.x-swift-contains-not-codable}}
 {{/isEnum}}
 {{/isArray}}
diff --git a/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache
index fbd65a9806d1..9f83c589b57d 100644
--- a/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache
+++ b/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache
@@ -5,6 +5,7 @@ public struct {{{classname}}}: Codable {
 {{#allVars}}
 {{#isEnum}}
 {{> modelInlineEnumDeclaration}}
+
 {{/isEnum}}
 {{/allVars}}
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache b/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache
index 4b1ecf700e64..b942011c238f 100644
--- a/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache
+++ b/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache
@@ -5,6 +5,7 @@ public struct {{{classname}}}: Codable {
 {{#allVars}}
 {{#isEnum}}
 {{> modelInlineEnumDeclaration}}
+
 {{/isEnum}}
 {{/allVars}}
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
index cdc954502fd6..2b3adfa77536 100644
--- a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
@@ -5,6 +5,7 @@
 {{#allVars}}
 {{#isEnum}}
 {{> modelInlineEnumDeclaration}}
+
 {{/isEnum}}
 {{/allVars}}
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache
index 85e5a737230b..86bae2384965 100644
--- a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache
+++ b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache
@@ -5,6 +5,7 @@
 {{#allVars}}
 {{#isEnum}}
 {{> modelInlineEnumDeclaration}}
+
 {{/isEnum}}
 {{/allVars}}
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
index 24a9c0f0b60f..8e4507f2c022 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
@@ -14,8 +14,10 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
 {{/allVars}}
 }
 {{>modelGenericEnums}}
+
 {{/parent}}
 {{^parent}}
 {{>modelGeneric}}
+
 {{/parent}}
 {{/discriminator}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
index 23a8d4d6cf1b..9591a4dc65e7 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 {{^withSeparateModelsAndApi}}
 import type { Configuration } from './configuration{{importFileExtension}}';
 import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
@@ -26,6 +27,7 @@ import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerM
 {{/models}}
 {{#apiInfo}}{{#apis}}
 {{>apiInner}}
+
 {{/apis}}{{/apiInfo}}
 {{/withSeparateModelsAndApi}}{{#withSeparateModelsAndApi}}
 {{#apiInfo}}{{#apis}}{{#operations}}export * from './{{tsApiPackage}}/{{classFilename}}{{importFileExtension}}';
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
index f1bf3f64c841..c45fb56c3232 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
@@ -3,6 +3,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 import type { Configuration } from '{{apiRelativeToRoot}}configuration{{importFileExtension}}';
 import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
index d469bb30e2c6..59badfdf487a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 import type { Configuration } from './configuration{{importFileExtension}}';
 // Some imports not used depending on template conditions
 // @ts-ignore
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache
index 71114e1a31bf..7b19eed554a9 100755
--- a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 import type { Configuration } from "./configuration{{importFileExtension}}";
 import type { RequestArgs } from "./base{{importFileExtension}}";
 import type { AxiosInstance, AxiosResponse } from 'axios';
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
index 400889582677..f5db62f5ae2e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 export interface ConfigurationParameters {
     apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
     username?: string;
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
index ab51dce618c4..37fb945c259d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 export * from "./api{{importFileExtension}}";
 export * from "./configuration{{importFileExtension}}";
 {{#withSeparateModelsAndApi}}export * from "./{{tsModelPackage}}{{importFileExtension}}";{{/withSeparateModelsAndApi}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
index d9ab0b19d33a..4c4d4a73bdc8 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
@@ -1,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 {{>licenseInfo}}
+
 {{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}}
 // May contain unused imports in some cases
 // @ts-ignore
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/modelEnum.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/modelEnum.mustache
index 9f5b6b3323e1..5a3ecec5ac77 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/modelEnum.mustache
@@ -10,8 +10,10 @@ export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last
 {{^isBoolean}}
 {{^stringEnums}}
 {{>modelObjectEnum}}
+
 {{/stringEnums}}
 {{#stringEnums}}
 {{>modelStringEnum}}
+
 {{/stringEnums}}
 {{/isBoolean}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index dfe4f97471e1..cb90d4dd104d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 import * as runtime from '../runtime{{importFileExtension}}';
 {{#imports.0}}
 import type {
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
index 454f2c68b792..b28503d5dcb2 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
@@ -18,6 +18,7 @@ import { type {{modelName}}, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{
 {{/discriminator}}
 {{>modelGenericInterfaces}}
 
+
 /**
  * Check if a given object implements the {{classname}} interface.
  */
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
index 1d35933047a3..b348e10c9483 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
@@ -21,6 +21,7 @@ import {
 {{/hasImports}}
 {{>modelOneOfInterfaces}}
 
+
 export function {{classname}}FromJSON(json: any): {{classname}} {
     return {{classname}}FromJSONTyped(json, false);
 }
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache
index b79d33935bf7..e1c7d93edb5e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/models.index.mustache
@@ -13,15 +13,18 @@ export * from './{{{ classFilename }}}Record{{importFileExtension}}';
 {{#withoutRuntimeChecks}}
 {{#isEnum}}
 {{>modelEnumInterfaces}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>modelOneOfInterfaces}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
 {{>modelGenericInterfaces}}
+
 {{/oneOf}}
 {{/isEnum}}
 {{/withoutRuntimeChecks}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/models.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/models.mustache
index 20135a844250..7926c460c77a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/models.mustache
@@ -1,19 +1,23 @@
 /* tslint:disable */
 /* eslint-disable */
 {{>licenseInfo}}
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{>modelEnum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>modelOneOf}}
+
 {{/-first}}
 {{/oneOf}}
 {{^oneOf}}
 {{>modelGeneric}}
+
 {{/oneOf}}
 {{/isEnum}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/records.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/records.mustache
index 5c8a0ad348a5..c737941dd389 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/records.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/records.mustache
@@ -8,7 +8,9 @@
 /* tslint:disable */
 /* eslint-disable */
 {{>licenseInfo}}
+
 {{>recordGeneric}}
+
 {{/oneOf}}
 {{/isEnum}}
 {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index d29baae425a7..8cfe7948e922 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
index f338b72760c8..2ea9cf32d73a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
@@ -2,6 +2,7 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+
 import {Api} from './index{{importFileExtension}}';
 import {List} from 'immutable';
 import {all, fork, put, takeLatest} from "redux-saga/effects";
diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
index 7056798e03b3..9fa2c695603d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
@@ -14,8 +14,10 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
 {{/allVars}}
 }
 {{>modelGenericEnums}}
+
 {{/parent}}
 {{^parent}}
 {{>modelGeneric}}
+
 {{/parent}}
 {{/discriminator}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/modelTaggedUnion.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/modelTaggedUnion.mustache
index 754c1db278ba..5a044e0d9c5c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-nestjs/modelTaggedUnion.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/modelTaggedUnion.mustache
@@ -14,8 +14,10 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
 {{/allVars}}
 }
 {{>modelGenericEnums}}
+
 {{/parent}}
 {{^parent}}
 {{>modelGeneric}}
+
 {{/parent}}
 {{/discriminator}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache
index 1cbe325491e7..29d656c58bb1 100644
--- a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache
@@ -1,6 +1,7 @@
 // tslint:disable
 {{>licenseInfo}}
 
+
 import { HttpMethods, QueryConfig, ResponseBody, ResponseText } from 'redux-query';
 import * as runtime from '../runtime';
 {{#imports.0}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/models.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/models.mustache
index 9d541a58da4e..d18ca5a9d84c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-redux-query/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/models.mustache
@@ -1,24 +1,29 @@
 // tslint:disable
 {{>licenseInfo}}
+
 {{#models}}
 {{#model}}
 {{#isEnum}}
 {{>modelEnum}}
+
 {{/isEnum}}
 {{^isEnum}}
 {{#oneOf}}
 {{#-first}}
 {{>modelOneOf}}
+
 {{/-first}}
 {{/oneOf}}
 {{#allOf}}
 {{#-first}}
 {{>modelAllOf}}
+
 {{/-first}}
 {{/allOf}}
 {{^oneOf}}
 {{^allOf}}
 {{>modelGeneric}}
+
 {{/allOf}}
 {{/oneOf}}
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache
index d4bbf67367cd..a50947fdc784 100644
--- a/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/runtime.mustache
@@ -1,6 +1,7 @@
 // tslint:disable
 {{>licenseInfo}}
 
+
 import { Meta, OptimisticUpdate, QueryKey, QueryOptions, Rollback, TransformStrategy, Update } from "redux-query";
 
 export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index 8c63db19fb11..e0ca79a7946f 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -1,5 +1,6 @@
 // tslint:disable
 {{>licenseInfo}}
+
 import type { Observable } from 'rxjs';
 import type { AjaxResponse } from 'rxjs/ajax';
 import { BaseAPI{{#hasRequiredParams}}, throwIfNullOrUndefined{{/hasRequiredParams}}{{#hasPathParams}}, encodeURI{{/hasPathParams}}{{#hasListContainers}}, COLLECTION_FORMATS{{/hasListContainers}} } from '../runtime';
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/models.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/models.mustache
index 6f5fe539ee41..d9a47a93c016 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/models.mustache
@@ -1,5 +1,6 @@
 // tslint:disable
 {{>licenseInfo}}
+
 {{#models}}
 {{#model}}
 {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#allOf}}{{#-first}}{{>modelAllOf}}{{/-first}}{{/allOf}}{{^isEnum}}{{^oneOf}}{{^allOf}}{{>modelGeneric}}{{/allOf}}{{/oneOf}}{{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
index e8a6eb9b8e5a..cef37b4be4f6 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -1,5 +1,6 @@
 // tslint:disable
 {{>licenseInfo}}
+
 import { of } from 'rxjs';
 import type { Observable{{#withProgressSubscriber}}, Subscriber{{/withProgressSubscriber}} } from 'rxjs';
 import { ajax } from 'rxjs/ajax';