diff --git a/modules/openapi-generator/src/main/resources/Java/README.mustache b/modules/openapi-generator/src/main/resources/Java/README.mustache
index c08caee14c30..7a78735e217f 100644
--- a/modules/openapi-generator/src/main/resources/Java/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/README.mustache
@@ -197,11 +197,14 @@ Class | Method | HTTP request | Description
{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
{{/model}}{{/models}}
+
## Documentation for Authorization
-{{^authMethods}}All endpoints do not require authorization.
-{{/authMethods}}Authentication schemes defined for the API:
-{{#authMethods}}### {{name}}
+{{^authMethods}}Endpoints do not require authorization.{{/authMethods}}
+{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}}
+{{#authMethods}}
+
+### {{name}}
{{#isApiKey}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache
index c6ae4fa23617..97c99cc36a5c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache
@@ -158,11 +158,14 @@ Class | Method | HTTP request | Description
{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
{{/model}}{{/models}}
+
## Documentation for Authorization
-{{^authMethods}}All endpoints do not require authorization.
-{{/authMethods}}Authentication schemes defined for the API:
-{{#authMethods}}### {{name}}
+{{^authMethods}}Endpoints do not require authorization.{{/authMethods}}
+{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}}
+{{#authMethods}}
+
+### {{name}}
{{#isApiKey}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
index ef15f379a13c..aee6dd8e24f7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
@@ -139,11 +139,14 @@ Class | Method | HTTP request | Description
{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
{{/model}}{{/models}}
+
## Documentation for Authorization
-{{^authMethods}}All endpoints do not require authorization.
-{{/authMethods}}Authentication schemes defined for the API:
-{{#authMethods}}### {{name}}
+{{^authMethods}}Endpoints do not require authorization.{{/authMethods}}
+{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}}
+{{#authMethods}}
+
+### {{name}}
{{#isApiKey}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache
index 474cb7954bf5..2b125e1f9cad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache
@@ -266,7 +266,7 @@ public class Example {
{{/responses.0}}
{{#vendorExtensions.x-group-parameters}}{{#hasParams}}
-
+
## API{{operationId}}Request
### Properties
{{#allParams}}{{#-last}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
index 40f8a61cacbf..2ab9946deb8d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
@@ -155,11 +155,14 @@ Class | Method | HTTP request | Description
{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
{{/model}}{{/models}}
+
## Documentation for Authorization
-{{^authMethods}}All endpoints do not require authorization.
-{{/authMethods}}Authentication schemes defined for the API:
-{{#authMethods}}### {{name}}
+{{^authMethods}}Endpoints do not require authorization.{{/authMethods}}
+{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}}
+{{#authMethods}}
+
+### {{name}}
{{#isApiKey}}- **Type**: API key
- **API key parameter name**: {{keyParamName}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache
index ec9139f0c375..dea75bd2b98e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache
@@ -10,7 +10,7 @@ All URIs are relative to *{{basePath}}*
{{#operations}}
{{#operation}}
-
+
# **{{operationId}}**{{^vendorExtensions.x-group-parameters}}
> {{#returnType}}{{.}} {{/returnType}}{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}){{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}
> {{#returnType}}{{.}} {{/returnType}}{{operationId}}({{#requiredParams}}{{paramName}}{{^-last}}, {{/-last}}{{/requiredParams}}){{#optionalParams}}.{{paramName}}({{paramName}}){{/optionalParams}}.execute();{{/vendorExtensions.x-group-parameters}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache
index b3ca8dfab776..42d223aea6e3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache
@@ -10,7 +10,7 @@ All URIs are relative to *{{basePath}}*
{{#operations}}
{{#operation}}
-
+
# **{{operationId}}**
> {{#returnType}}{{.}} {{/returnType}}{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}})
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/api_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/api_doc.mustache
index b05c3db3fa00..d0cb484d5dda 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/api_doc.mustache
@@ -38,7 +38,7 @@ More information can be found inside [Inversion of Control guide section](https:
{{#operations}}
{{#operation}}
-
+
# **{{operationId}}**
```java
{{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono{{/returnType}} {{classname}}.{{nickname}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/auth.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/auth.mustache
index 9c5ba683fb75..50252389b19f 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/auth.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/doc/auth.mustache
@@ -1,6 +1,6 @@
# Authorization methods
{{#authMethods}}
-
+
# {{name}}
{{!
basic auth
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/server/doc/controller_doc.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/server/doc/controller_doc.mustache
index 80d49233c566..2f2348268f2d 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/server/doc/controller_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/server/doc/controller_doc.mustache
@@ -15,7 +15,7 @@ Method | HTTP request | Description
{{#operations}}
{{#operation}}
-
+
# **{{operationId}}**
```java
{{#returnType}}Mono<{{{returnType}}}>{{/returnType}}{{^returnType}}Mono