From fda71a283ed0a86c86192afbc193aaaef1758135 Mon Sep 17 00:00:00 2001
From: Daymon Schodits <daymon.schodits@secunet.com>
Date: Tue, 18 Nov 2025 20:07:12 +0100
Subject: [PATCH 1/5] added UnaryInterceptor functionality

---
 docs/generators/java.md                       |  1 +
 .../codegen/languages/JavaClientCodegen.java  |  4 ++++
 .../Java/libraries/native/ApiClient.mustache  | 21 +++++++++++------
 .../Java/libraries/native/api.mustache        | 23 ++++++++++++++++---
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/docs/generators/java.md b/docs/generators/java.md
index 7c9ffca4760d..30cf3547bd75 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -104,6 +104,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
+|useUnaryInterceptor|Specify if the ResponseInterceptor should be able to change the request before beeing returned| |false|
 |useSingleRequestParameter|Setting this property to &quot;true&quot; will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to &quot;static&quot; does the same as &quot;true&quot;, but also makes the generated arguments class static with single parameter instantiation.| |false|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index 43767dc58d00..e2f9fd0f1b57 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -105,6 +105,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String FAIL_ON_UNKNOWN_PROPERTIES = "failOnUnknownProperties";
     public static final String SUPPORT_VERTX_FUTURE = "supportVertxFuture";
     public static final String USE_SEALED_ONE_OF_INTERFACES = "useSealedOneOfInterfaces";
+    public static final String USE_UNARY_INTERCEPTOR = "useUnaryInterceptor";
 
     // Internal configurations
     public static final String SINGLE_REQUEST_PARAMETER = "singleRequestParameter";
@@ -149,6 +150,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     @Getter @Setter protected boolean failOnUnknownProperties = false;
     @Setter protected boolean supportVertxFuture = false;
     @Setter protected boolean useSealedOneOfInterfaces = false;
+    @Setter protected boolean useUnaryInterceptor = true;
     protected String authFolder;
     /**
      * Serialization library.
@@ -260,6 +262,7 @@ public JavaClientCodegen() {
         cliOptions.add(CliOption.newBoolean(FAIL_ON_UNKNOWN_PROPERTIES, "Fail Jackson de-serialization on unknown properties", this.failOnUnknownProperties));
         cliOptions.add(CliOption.newBoolean(SUPPORT_VERTX_FUTURE, "Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.", this.supportVertxFuture));
         cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.", this.useSealedOneOfInterfaces));
+        cliOptions.add(CliOption.newBoolean(USE_UNARY_INTERCEPTOR, "If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption", this.useUnaryInterceptor));
 
         supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1");
         supportedLibraries.put(JERSEY3, "HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1");
@@ -376,6 +379,7 @@ public void processOpts() {
         }
         convertPropertyToStringAndWriteBack(CodegenConstants.USE_SINGLE_REQUEST_PARAMETER, this::setUseSingleRequestParameter);
         convertPropertyToBooleanAndWriteBack(USE_SEALED_ONE_OF_INTERFACES, this::setUseSealedOneOfInterfaces);
+        convertPropertyToBooleanAndWriteBack(USE_UNARY_INTERCEPTOR, this::setUseUnaryInterceptor);
         writePropertyBack(SINGLE_REQUEST_PARAMETER, getSingleRequestParameter());
         writePropertyBack(STATIC_REQUEST, getStaticRequest());
 
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 e49c8acc859f..71c651310ef8 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
@@ -37,7 +37,7 @@ import java.util.Objects;
 import java.util.zip.GZIPOutputStream;
 {{/useGzipFeature}}
 import java.util.stream.Collectors;
-
+{{#useUnaryInterceptor}}import java.util.function.UnaryOperator;{{/useUnaryInterceptor}}
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,15 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
+{{#useUnaryInterceptor}}
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+{{/useUnaryInterceptor}}
+{{^useUnaryInterceptor}}
   protected Consumer<HttpResponse<InputStream>> responseInterceptor;
   protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+{{/useUnaryInterceptor}}
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -361,12 +368,12 @@ public class ApiClient {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor({{#useUnaryInterceptor}}UnaryOperator{{/useUnaryInterceptor}}{{^useUnaryInterceptor}}Consumer{{/useUnaryInterceptor}}<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -376,7 +383,7 @@ public class ApiClient {
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public {{#useUnaryInterceptor}}UnaryOperator{{/useUnaryInterceptor}}{{^useUnaryInterceptor}}Consumer{{/useUnaryInterceptor}}<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -384,12 +391,12 @@ public class ApiClient {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor({{#useUnaryInterceptor}}UnaryOperator{{/useUnaryInterceptor}}{{^useUnaryInterceptor}}Consumer{{/useUnaryInterceptor}}<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -399,7 +406,7 @@ public class ApiClient {
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public {{#useUnaryInterceptor}}UnaryOperator{{/useUnaryInterceptor}}{{^useUnaryInterceptor}}Consumer{{/useUnaryInterceptor}}<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
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 b9ef07965948..36e24636aed7 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
@@ -48,6 +48,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+{{#useUnaryInterceptor}}import java.util.function.UnaryOperator;{{/useUnaryInterceptor}}
 import java.util.function.Consumer;
 {{#useGzipFeature}}
 import java.util.function.Supplier;
@@ -86,8 +87,14 @@ public class {{classname}} {
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
+{{#useUnaryInterceptor}}
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+{{/useUnaryInterceptor}}
+{{^useUnaryInterceptor}}
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
   private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+{{/useUnaryInterceptor}}
 
   public {{classname}}() {
     this(Configuration.getDefaultApiClient());
@@ -433,7 +440,12 @@ public class {{classname}} {
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+        {{#useUnaryInterceptor}}
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+        {{/useUnaryInterceptor}}
+        {{^useUnaryInterceptor}}
+            memberVarResponseInterceptor.accept(localVarResponse);
+        {{/useUnaryInterceptor}}
       }
       InputStream localVarResponseBody = null;
       try {
@@ -526,7 +538,12 @@ public class {{classname}} {
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              {{#useUnaryInterceptor}}
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              {{/useUnaryInterceptor}}
+              {{^useUnaryInterceptor}}
+              memberVarResponseInterceptor.accept(localVarResponse);
+              {{/useUnaryInterceptor}}
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("{{operationId}}", localVarResponse));
@@ -935,4 +952,4 @@ public class {{classname}} {
   {{/vendorExtensions.x-group-parameters}}
   {{/operation}}
 }
-{{/operations}}
+{{/operations}}
\ No newline at end of file

From 58d14985c9903e2c9a8f9a1c535ee2440c1e15d8 Mon Sep 17 00:00:00 2001
From: Daymon Schodits <daymon.schodits@secunet.com>
Date: Tue, 18 Nov 2025 20:46:48 +0100
Subject: [PATCH 2/5] set useUnaryInterceptor default to false

---
 .../org/openapitools/codegen/languages/JavaClientCodegen.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index e2f9fd0f1b57..c532d93fa99b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -150,7 +150,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     @Getter @Setter protected boolean failOnUnknownProperties = false;
     @Setter protected boolean supportVertxFuture = false;
     @Setter protected boolean useSealedOneOfInterfaces = false;
-    @Setter protected boolean useUnaryInterceptor = true;
+    @Setter protected boolean useUnaryInterceptor = false;
     protected String authFolder;
     /**
      * Serialization library.

From 67c96ca3c2f77de8d8d3642ffccb961ba754abd4 Mon Sep 17 00:00:00 2001
From: Daymon Schodits <daymon.schodits@secunet.com>
Date: Tue, 18 Nov 2025 21:05:34 +0100
Subject: [PATCH 3/5] added generated files

---
 docs/generators/java-microprofile.md          |  1 +
 docs/generators/java.md                       |  2 +-
 .../org/openapitools/client/ApiClient.java    | 19 ++++----
 .../org/openapitools/client/api/AuthApi.java  |  9 ++--
 .../org/openapitools/client/api/BodyApi.java  | 25 ++++++-----
 .../org/openapitools/client/api/FormApi.java  | 11 ++---
 .../openapitools/client/api/HeaderApi.java    |  7 +--
 .../org/openapitools/client/api/PathApi.java  |  7 +--
 .../org/openapitools/client/api/QueryApi.java | 27 +++++------
 .../docs/Animal.md                            |  1 -
 .../docs/AnotherAnimal.md                     |  1 -
 .../docs/Bird.md                              |  2 -
 .../docs/Robobird.md                          |  2 -
 .../org/openapitools/client/models/Animal.kt  | 12 ++---
 .../client/models/AnotherAnimal.kt            | 12 ++---
 .../org/openapitools/client/models/Bird.kt    |  9 +---
 .../openapitools/client/models/Robobird.kt    |  9 +---
 .../org/openapitools/client/ApiClient.java    | 19 ++++----
 .../client/api/AnotherFakeApi.java            |  7 +--
 .../openapitools/client/api/DefaultApi.java   |  7 +--
 .../org/openapitools/client/api/FakeApi.java  | 45 ++++++++++---------
 .../client/api/FakeClassnameTags123Api.java   |  7 +--
 .../org/openapitools/client/api/PetApi.java   | 23 +++++-----
 .../org/openapitools/client/api/StoreApi.java | 13 +++---
 .../org/openapitools/client/api/UserApi.java  | 21 ++++-----
 .../org/openapitools/client/ApiClient.java    | 19 ++++----
 .../org/openapitools/client/api/PetApi.java   | 21 ++++-----
 .../org/openapitools/client/api/StoreApi.java | 13 +++---
 .../org/openapitools/client/api/UserApi.java  | 21 ++++-----
 .../org/openapitools/client/ApiClient.java    | 19 ++++----
 .../org/openapitools/client/api/PetApi.java   |  7 +--
 .../org/openapitools/client/ApiClient.java    | 19 ++++----
 .../client/api/AnotherFakeApi.java            |  7 +--
 .../openapitools/client/api/DefaultApi.java   |  7 +--
 .../org/openapitools/client/api/FakeApi.java  | 45 ++++++++++---------
 .../client/api/FakeClassnameTags123Api.java   |  7 +--
 .../org/openapitools/client/api/PetApi.java   | 23 +++++-----
 .../org/openapitools/client/api/StoreApi.java | 13 +++---
 .../org/openapitools/client/api/UserApi.java  | 21 ++++-----
 39 files changed, 275 insertions(+), 265 deletions(-)

diff --git a/docs/generators/java-microprofile.md b/docs/generators/java-microprofile.md
index b928fb0f32e3..385a27b66ecf 100644
--- a/docs/generators/java-microprofile.md
+++ b/docs/generators/java-microprofile.md
@@ -105,6 +105,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
 |useSingleRequestParameter|Setting this property to &quot;true&quot; will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to &quot;static&quot; does the same as &quot;true&quot;, but also makes the generated arguments class static with single parameter instantiation.| |false|
+|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |true|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 30cf3547bd75..ecce00665774 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -104,8 +104,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
-|useUnaryInterceptor|Specify if the ResponseInterceptor should be able to change the request before beeing returned| |false|
 |useSingleRequestParameter|Setting this property to &quot;true&quot; will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to &quot;static&quot; does the same as &quot;true&quot;, but also makes the generated arguments class static with single parameter instantiation.| |false|
+|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |true|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
index 261dec248d2a..8009b2d05dc8 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-
+import java.util.function.UnaryOperator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,9 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
-  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -359,12 +360,12 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -374,7 +375,7 @@ public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> inte
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -382,12 +383,12 @@ public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -397,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
index a53cf681df7e..eab5989f6935 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
@@ -43,6 +43,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -72,8 +73,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AuthApi() {
     this(Configuration.getDefaultApiClient());
@@ -208,7 +209,7 @@ public ApiResponse<String> testAuthHttpBasicWithHttpInfo(Map<String, String> hea
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -311,7 +312,7 @@ public ApiResponse<String> testAuthHttpBearerWithHttpInfo(Map<String, String> he
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
index c29f40fc17c6..09f28077f876 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
@@ -53,6 +53,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -82,8 +83,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public BodyApi() {
     this(Configuration.getDefaultApiClient());
@@ -218,7 +219,7 @@ public ApiResponse<File> testBinaryGifWithHttpInfo(Map<String, String> headers)
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -330,7 +331,7 @@ public ApiResponse<String> testBodyApplicationOctetstreamBinaryWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -443,7 +444,7 @@ public ApiResponse<String> testBodyMultipartFormdataArrayOfBinaryWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -590,7 +591,7 @@ public ApiResponse<String> testBodyMultipartFormdataSingleBinaryWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -731,7 +732,7 @@ public ApiResponse<Pet> testEchoBodyAllOfPetWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -850,7 +851,7 @@ public ApiResponse<String> testEchoBodyFreeFormObjectResponseStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -963,7 +964,7 @@ public ApiResponse<Pet> testEchoBodyPetWithHttpInfo(@javax.annotation.Nullable P
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1082,7 +1083,7 @@ public ApiResponse<String> testEchoBodyPetResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1195,7 +1196,7 @@ public ApiResponse<StringEnumRef> testEchoBodyStringEnumWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1314,7 +1315,7 @@ public ApiResponse<String> testEchoBodyTagResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
index 9a68ac1a4cf6..19f723768d14 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FormApi() {
     this(Configuration.getDefaultApiClient());
@@ -227,7 +228,7 @@ public ApiResponse<String> testFormIntegerBooleanStringWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -355,7 +356,7 @@ public ApiResponse<String> testFormObjectMultipartWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -521,7 +522,7 @@ public ApiResponse<String> testFormOneofWithHttpInfo(@javax.annotation.Nullable
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
index 92eb9523b2df..a3aafdcb4805 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public HeaderApi() {
     this(Configuration.getDefaultApiClient());
@@ -235,7 +236,7 @@ public ApiResponse<String> testHeaderIntegerBooleanStringEnumsWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
index b462605735fd..bfe40c22e00f 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PathApi() {
     this(Configuration.getDefaultApiClient());
@@ -231,7 +232,7 @@ public ApiResponse<String> testsPathStringPathStringIntegerPathIntegerEnumNonref
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
index bdaa4c94f52b..15dc871aebc9 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
@@ -56,6 +56,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -85,8 +86,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public QueryApi() {
     this(Configuration.getDefaultApiClient());
@@ -229,7 +230,7 @@ public ApiResponse<String> testEnumRefStringWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -361,7 +362,7 @@ public ApiResponse<String> testQueryDatetimeDateStringWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -495,7 +496,7 @@ public ApiResponse<String> testQueryIntegerBooleanStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -621,7 +622,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -748,7 +749,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHtt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -875,7 +876,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayIntegerWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -997,7 +998,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayStringWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1119,7 +1120,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1241,7 +1242,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1368,7 +1369,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1494,7 +1495,7 @@ public ApiResponse<String> testQueryStyleJsonSerializationObjectWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
index aaffda15d819..bc6b0758c4d7 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
@@ -4,7 +4,6 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
-| **discriminator** | **kotlin.String** |  |  |
 | **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
index c5bc8ab96395..ec471ab303f4 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
@@ -5,7 +5,6 @@
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
 | **discriminator** | **kotlin.String** |  |  |
-| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
 | **propertyB** | **kotlin.String** |  |  [optional] |
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
index f42f4e951c03..f979cf3c0690 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
@@ -4,8 +4,6 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
-| **discriminator** | **kotlin.String** |  |  |
-| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.Int** |  |  [optional] |
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
index 8208e46652a2..4cd2eda5662e 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
@@ -4,8 +4,6 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
-| **discriminator** | **kotlin.String** |  |  |
-| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyB** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 5daa221dc730..ec17555c7ead 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive
 @Serializable(with = AnimalSerializer::class)
 sealed interface Animal {
     @JvmInline
-     value class BirdWrapper(val value: Bird) : Animal
+     value class (val value: Bird) : Animal
 
     @JvmInline
-     value class RobobirdWrapper(val value: Robobird) : Animal
+     value class (val value: Robobird) : Animal
 
 }
 
@@ -56,12 +56,12 @@ object AnimalSerializer : KSerializer<Animal> {
     override fun serialize(encoder: Encoder, value: Animal) {
         require(encoder is JsonEncoder)
         val jsonObject = when (value) {
-            is Animal.BirdWrapper -> {
+            is Animal. -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["discriminator"] = JsonPrimitive("BIRD")
                 JsonObject(jsonMap)
             }
-            is Animal.RobobirdWrapper -> {
+            is Animal. -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["discriminator"] = JsonPrimitive("ROBOBIRD")
                 JsonObject(jsonMap)
@@ -80,11 +80,11 @@ object AnimalSerializer : KSerializer<Animal> {
         return when (discriminatorValue) {
             "BIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element)
-                Animal.BirdWrapper(decoded)
+                Animal.(decoded)
             }
             "ROBOBIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element)
-                Animal.RobobirdWrapper(decoded)
+                Animal.(decoded)
             }
             else -> throw SerializationException("Unknown Animal discriminator: $discriminatorValue")
         }
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
index 4fa0bb4eb937..cbe63fadb955 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
@@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive
 @Serializable(with = AnotherAnimalSerializer::class)
 sealed interface AnotherAnimal {
     @JvmInline
-     value class AnotherBirdWrapper(val value: Bird) : AnotherAnimal
+     value class (val value: Bird) : AnotherAnimal
 
     @JvmInline
-     value class AnotherRobobirdWrapper(val value: Robobird) : AnotherAnimal
+     value class (val value: Robobird) : AnotherAnimal
 
 }
 
@@ -56,12 +56,12 @@ object AnotherAnimalSerializer : KSerializer<AnotherAnimal> {
     override fun serialize(encoder: Encoder, value: AnotherAnimal) {
         require(encoder is JsonEncoder)
         val jsonObject = when (value) {
-            is AnotherAnimal.AnotherBirdWrapper -> {
+            is AnotherAnimal. -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_BIRD")
                 JsonObject(jsonMap)
             }
-            is AnotherAnimal.AnotherRobobirdWrapper -> {
+            is AnotherAnimal. -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_ROBOBIRD")
                 JsonObject(jsonMap)
@@ -80,11 +80,11 @@ object AnotherAnimalSerializer : KSerializer<AnotherAnimal> {
         return when (discriminatorValue) {
             "ANOTHER_BIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element)
-                AnotherAnimal.AnotherBirdWrapper(decoded)
+                AnotherAnimal.(decoded)
             }
             "ANOTHER_ROBOBIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element)
-                AnotherAnimal.AnotherRobobirdWrapper(decoded)
+                AnotherAnimal.(decoded)
             }
             else -> throw SerializationException("Unknown AnotherAnimal another_discriminator: $discriminatorValue")
         }
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
index f74aff360a72..da1f56ed1c7b 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
@@ -28,21 +28,14 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * 
  *
- * @param discriminator 
- * @param anotherDiscriminator 
  * @param propertyA 
  * @param sameNameProperty 
  */
 @Serializable
 
+@SerialName(value = "ANOTHER_BIRD")
 data class Bird (
 
-    @SerialName(value = "discriminator")
-    val discriminator: kotlin.String,
-
-    @SerialName(value = "another_discriminator")
-    val anotherDiscriminator: kotlin.String,
-
     @SerialName(value = "propertyA")
     val propertyA: kotlin.String? = null,
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
index 7af01c66bb1a..fbeb555149b1 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
@@ -28,21 +28,14 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * 
  *
- * @param discriminator 
- * @param anotherDiscriminator 
  * @param propertyB 
  * @param sameNameProperty 
  */
 @Serializable
 
+@SerialName(value = "ANOTHER_ROBOBIRD")
 data class Robobird (
 
-    @SerialName(value = "discriminator")
-    val discriminator: kotlin.String,
-
-    @SerialName(value = "another_discriminator")
-    val anotherDiscriminator: kotlin.String,
-
     @SerialName(value = "propertyB")
     val propertyB: kotlin.String? = null,
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
index 3f503b919cc4..5f9d37f7d678 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-
+import java.util.function.UnaryOperator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,9 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
-  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -359,12 +360,12 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -374,7 +375,7 @@ public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> inte
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -382,12 +383,12 @@ public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -397,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 2ee4a0b7a141..744848eeac77 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -75,8 +76,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AnotherFakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -221,7 +222,7 @@ public CompletableFuture<ApiResponse<Client>> call123testSpecialTagsWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("call123testSpecialTags", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
index 034ac23ffe17..7a72f4eb85b3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -75,8 +76,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public DefaultApi() {
     this(Configuration.getDefaultApiClient());
@@ -217,7 +218,7 @@ public CompletableFuture<ApiResponse<FooGetDefaultResponse>> fooGetWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fooGet", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
index f8bf6ea550ef..e90fa194b1b2 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -61,6 +61,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -92,8 +93,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -234,7 +235,7 @@ public CompletableFuture<ApiResponse<FakeBigDecimalMap200Response>> fakeBigDecim
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeBigDecimalMap", localVarResponse));
@@ -352,7 +353,7 @@ public CompletableFuture<ApiResponse<HealthCheckResult>> fakeHealthGetWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeHealthGet", localVarResponse));
@@ -474,7 +475,7 @@ public CompletableFuture<ApiResponse<Boolean>> fakeOuterBooleanSerializeWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterBooleanSerialize", localVarResponse));
@@ -602,7 +603,7 @@ public CompletableFuture<ApiResponse<OuterComposite>> fakeOuterCompositeSerializ
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterCompositeSerialize", localVarResponse));
@@ -730,7 +731,7 @@ public CompletableFuture<ApiResponse<BigDecimal>> fakeOuterNumberSerializeWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterNumberSerialize", localVarResponse));
@@ -858,7 +859,7 @@ public CompletableFuture<ApiResponse<String>> fakeOuterStringSerializeWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterStringSerialize", localVarResponse));
@@ -977,7 +978,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getApplicationJsonUtf8Wit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getApplicationJsonUtf8", localVarResponse));
@@ -1095,7 +1096,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getArrayOfEnumsWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getArrayOfEnums", localVarResponse));
@@ -1217,7 +1218,7 @@ public CompletableFuture<ApiResponse<Void>> testAdditionalPropertiesReferenceWit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testAdditionalPropertiesReference", localVarResponse));
@@ -1334,7 +1335,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithFileSchemaWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithFileSchema", localVarResponse));
@@ -1455,7 +1456,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithQueryParamsWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithQueryParams", localVarResponse));
@@ -1591,7 +1592,7 @@ public CompletableFuture<ApiResponse<Client>> testClientModelWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClientModel", localVarResponse));
@@ -1775,7 +1776,7 @@ public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEndpointParameters", localVarResponse));
@@ -1980,7 +1981,7 @@ public CompletableFuture<ApiResponse<Void>> testEnumParametersWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEnumParameters", localVarResponse));
@@ -2218,7 +2219,7 @@ public CompletableFuture<ApiResponse<Void>> testGroupParametersWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testGroupParameters", localVarResponse));
@@ -2453,7 +2454,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineAdditionalPropertiesWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineAdditionalProperties", localVarResponse));
@@ -2570,7 +2571,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineFreeformAdditionalProperti
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineFreeformAdditionalProperties", localVarResponse));
@@ -2691,7 +2692,7 @@ public CompletableFuture<ApiResponse<Void>> testJsonFormDataWithHttpInfo(@javax.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testJsonFormData", localVarResponse));
@@ -2840,7 +2841,7 @@ public CompletableFuture<ApiResponse<Void>> testQueryParameterCollectionFormatWi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testQueryParameterCollectionFormat", localVarResponse));
@@ -2990,7 +2991,7 @@ public CompletableFuture<ApiResponse<Void>> testStringMapReferenceWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testStringMapReference", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 3982c43125c5..8f3375ff9ca2 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -81,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeClassnameTags123Api() {
     this(Configuration.getDefaultApiClient());
@@ -227,7 +228,7 @@ public CompletableFuture<ApiResponse<Client>> testClassnameWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClassname", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
index b378f6323824..e9de6b7b6220 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,6 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -83,8 +84,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -229,7 +230,7 @@ public CompletableFuture<ApiResponse<Void>> addPetWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("addPet", localVarResponse));
@@ -350,7 +351,7 @@ public CompletableFuture<ApiResponse<Void>> deletePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deletePet", localVarResponse));
@@ -465,7 +466,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByStatusWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByStatus", localVarResponse));
@@ -614,7 +615,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByTagsWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByTags", localVarResponse));
@@ -755,7 +756,7 @@ public CompletableFuture<ApiResponse<Pet>> getPetByIdWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getPetById", localVarResponse));
@@ -882,7 +883,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePet", localVarResponse));
@@ -1007,7 +1008,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithFormWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePetWithForm", localVarResponse));
@@ -1145,7 +1146,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFile", localVarResponse));
@@ -1317,7 +1318,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithRequiredFi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFileWithRequiredFile", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
index cb5d2a6086ed..c26a55b7f8ee 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -81,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -227,7 +228,7 @@ public CompletableFuture<ApiResponse<Void>> deleteOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteOrder", localVarResponse));
@@ -335,7 +336,7 @@ public CompletableFuture<ApiResponse<Map<String, Integer>>> getInventoryWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getInventory", localVarResponse));
@@ -457,7 +458,7 @@ public CompletableFuture<ApiResponse<Order>> getOrderByIdWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getOrderById", localVarResponse));
@@ -584,7 +585,7 @@ public CompletableFuture<ApiResponse<Order>> placeOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("placeOrder", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
index b80d6dd06b25..e4246f96d79f 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,6 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -82,8 +83,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -228,7 +229,7 @@ public CompletableFuture<ApiResponse<Void>> createUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUser", localVarResponse));
@@ -345,7 +346,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithArrayInputWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithArrayInput", localVarResponse));
@@ -462,7 +463,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithListInputWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithListInput", localVarResponse));
@@ -579,7 +580,7 @@ public CompletableFuture<ApiResponse<Void>> deleteUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteUser", localVarResponse));
@@ -691,7 +692,7 @@ public CompletableFuture<ApiResponse<User>> getUserByNameWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getUserByName", localVarResponse));
@@ -822,7 +823,7 @@ public CompletableFuture<ApiResponse<String>> loginUserWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("loginUser", localVarResponse));
@@ -965,7 +966,7 @@ public CompletableFuture<ApiResponse<Void>> logoutUserWithHttpInfo(Map<String, S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("logoutUser", localVarResponse));
@@ -1076,7 +1077,7 @@ public CompletableFuture<ApiResponse<Void>> updateUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarAsyncResponseInterceptor.accept(localVarResponse);
+              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updateUser", localVarResponse));
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
index f3e37e58684c..fe2ae1e856aa 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-
+import java.util.function.UnaryOperator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,9 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
-  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -359,12 +360,12 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -374,7 +375,7 @@ public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> inte
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -382,12 +383,12 @@ public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -397,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
index 6f93450ff3e2..1198ec745f41 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,6 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -81,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -221,7 +222,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -345,7 +346,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -455,7 +456,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@jakarta.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -595,7 +596,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@jakarta.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -727,7 +728,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -853,7 +854,7 @@ public ApiResponse<Pet> updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -981,7 +982,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@jakarta.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1114,7 +1115,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@jakarta.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
index 31f0574aee8a..0851f2c8c411 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -216,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -319,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -432,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnull L
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -550,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@jakarta.annotation.Nonnull Ord
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
index 44afc71d96db..0e72d38330cd 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,6 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +81,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -217,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@jakarta.annotation.Nonnull User
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -326,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@jakarta.annotati
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -435,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@jakarta.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -544,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -651,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@jakarta.annotation.Nonnull S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -773,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -904,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1007,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
index f3e37e58684c..fe2ae1e856aa 100644
--- a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-
+import java.util.function.UnaryOperator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,9 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
-  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -359,12 +360,12 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -374,7 +375,7 @@ public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> inte
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -382,12 +383,12 @@ public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -397,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
index 435606543feb..7edefb95a472 100644
--- a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -73,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -213,7 +214,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
index 3f503b919cc4..5f9d37f7d678 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-
+import java.util.function.UnaryOperator;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,9 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
-  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
+  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+
   protected Duration readTimeout;
   protected Duration connectTimeout;
 
@@ -359,12 +360,12 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    * Set a custom response interceptor.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -374,7 +375,7 @@ public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> inte
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -382,12 +383,12 @@ public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
    * Set a custom async response interceptor. Use this interceptor when asyncNative is set to 'true'.
    *
    * <p>This is useful for logging, monitoring or extraction of header variables</p>
-   *
+   * <p>If you are using the UnaryInterceptor you can even manipulate the response to a certain degree</p>
    * @param interceptor A function invoked before creating each request. A value
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -397,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index d641a4662ad3..ed61cda3d358 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -73,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AnotherFakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -213,7 +214,7 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
index ead7c4eddb43..0f56f1561670 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -73,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public DefaultApi() {
     this(Configuration.getDefaultApiClient());
@@ -209,7 +210,7 @@ public ApiResponse<FooGetDefaultResponse> fooGetWithHttpInfo(Map<String, String>
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
index 3d86e3ca616e..d577a73aac29 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -61,6 +61,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -90,8 +91,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -226,7 +227,7 @@ public ApiResponse<FakeBigDecimalMap200Response> fakeBigDecimalMapWithHttpInfo(M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -335,7 +336,7 @@ public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -448,7 +449,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -567,7 +568,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -686,7 +687,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -805,7 +806,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(@javax.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -915,7 +916,7 @@ public ApiResponse<List<OuterEnum>> getApplicationJsonUtf8WithHttpInfo(Map<Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1024,7 +1025,7 @@ public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1134,7 +1135,7 @@ public ApiResponse<Void> testAdditionalPropertiesReferenceWithHttpInfo(@javax.an
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1243,7 +1244,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1356,7 +1357,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1487,7 +1488,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1659,7 +1660,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1856,7 +1857,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2084,7 +2085,7 @@ public ApiResponse<Void> testGroupParametersWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2311,7 +2312,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2420,7 +2421,7 @@ public ApiResponse<Void> testInlineFreeformAdditionalPropertiesWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2533,7 +2534,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2674,7 +2675,7 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2816,7 +2817,7 @@ public ApiResponse<Void> testStringMapReferenceWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 45959c76a8d8..24113fd8dd4e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeClassnameTags123Api() {
     this(Configuration.getDefaultApiClient());
@@ -219,7 +220,7 @@ public ApiResponse<Client> testClassnameWithHttpInfo(@javax.annotation.Nonnull C
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
index 74529ccbf514..e348885ab35c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,6 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -81,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -218,7 +219,7 @@ public ApiResponse<Void> addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet, M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -331,7 +332,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -441,7 +442,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@javax.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -581,7 +582,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -713,7 +714,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -828,7 +829,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -945,7 +946,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1078,7 +1079,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1241,7 +1242,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
index 8192c66dbfd8..9e2b13a8a3a9 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -79,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -216,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -319,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -432,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Lon
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -550,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@javax.annotation.Nonnull Order
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
index 5e8ac868ed7b..22d9aaac26d5 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,6 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
+import java.util.function.UnaryOperator;
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +81,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -217,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@javax.annotation.Nonnull User u
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -326,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -435,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -544,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -651,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@javax.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -773,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -904,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1007,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
+            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {

From 8deecbcc6896fdb1bbaa277fe6f090937fe6a3ca Mon Sep 17 00:00:00 2001
From: Daymon Schodits <daymon.schodits@secunet.com>
Date: Fri, 21 Nov 2025 14:58:53 +0100
Subject: [PATCH 4/5] updated generated files to new default value

---
 docs/generators/java-microprofile.md          |  2 +-
 docs/generators/java.md                       |  2 +-
 .../org/openapitools/client/ApiClient.java    | 14 +++---
 .../org/openapitools/client/api/AuthApi.java  | 10 ++--
 .../org/openapitools/client/api/BodyApi.java  | 26 +++++------
 .../org/openapitools/client/api/FormApi.java  | 12 ++---
 .../openapitools/client/api/HeaderApi.java    |  8 ++--
 .../org/openapitools/client/api/PathApi.java  |  8 ++--
 .../org/openapitools/client/api/QueryApi.java | 28 +++++------
 .../docs/Animal.md                            |  1 +
 .../docs/AnotherAnimal.md                     |  1 +
 .../docs/Bird.md                              |  2 +
 .../docs/Robobird.md                          |  2 +
 .../org/openapitools/client/models/Animal.kt  | 12 ++---
 .../client/models/AnotherAnimal.kt            | 12 ++---
 .../org/openapitools/client/models/Bird.kt    |  9 +++-
 .../openapitools/client/models/Robobird.kt    |  9 +++-
 .../org/openapitools/client/ApiClient.java    | 14 +++---
 .../client/api/AnotherFakeApi.java            |  8 ++--
 .../openapitools/client/api/DefaultApi.java   |  8 ++--
 .../org/openapitools/client/api/FakeApi.java  | 46 +++++++++----------
 .../client/api/FakeClassnameTags123Api.java   |  8 ++--
 .../org/openapitools/client/api/PetApi.java   | 24 +++++-----
 .../org/openapitools/client/api/StoreApi.java | 14 +++---
 .../org/openapitools/client/api/UserApi.java  | 22 ++++-----
 .../org/openapitools/client/ApiClient.java    | 14 +++---
 .../org/openapitools/client/api/PetApi.java   | 22 ++++-----
 .../org/openapitools/client/api/StoreApi.java | 14 +++---
 .../org/openapitools/client/api/UserApi.java  | 22 ++++-----
 .../org/openapitools/client/ApiClient.java    | 14 +++---
 .../org/openapitools/client/api/PetApi.java   |  8 ++--
 .../org/openapitools/client/ApiClient.java    | 14 +++---
 .../client/api/AnotherFakeApi.java            |  8 ++--
 .../openapitools/client/api/DefaultApi.java   |  8 ++--
 .../org/openapitools/client/api/FakeApi.java  | 46 +++++++++----------
 .../client/api/FakeClassnameTags123Api.java   |  8 ++--
 .../org/openapitools/client/api/PetApi.java   | 24 +++++-----
 .../org/openapitools/client/api/StoreApi.java | 14 +++---
 .../org/openapitools/client/api/UserApi.java  | 22 ++++-----
 39 files changed, 280 insertions(+), 260 deletions(-)

diff --git a/docs/generators/java-microprofile.md b/docs/generators/java-microprofile.md
index 385a27b66ecf..9e02b37145ef 100644
--- a/docs/generators/java-microprofile.md
+++ b/docs/generators/java-microprofile.md
@@ -105,7 +105,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
 |useSingleRequestParameter|Setting this property to &quot;true&quot; will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to &quot;static&quot; does the same as &quot;true&quot;, but also makes the generated arguments class static with single parameter instantiation.| |false|
-|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |true|
+|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |false|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index ecce00665774..b98c5386e4e5 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -105,7 +105,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
 |useSingleRequestParameter|Setting this property to &quot;true&quot; will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to &quot;static&quot; does the same as &quot;true&quot;, but also makes the generated arguments class static with single parameter instantiation.| |false|
-|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |true|
+|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |false|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
index 8009b2d05dc8..d3bc84e2de98 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-import java.util.function.UnaryOperator;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,8 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
 
   protected Duration readTimeout;
   protected Duration connectTimeout;
@@ -365,7 +365,7 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -375,7 +375,7 @@ public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -388,7 +388,7 @@ public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -398,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStr
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
index eab5989f6935..980e9b2e509f 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
@@ -43,7 +43,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -73,8 +73,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AuthApi() {
     this(Configuration.getDefaultApiClient());
@@ -209,7 +209,7 @@ public ApiResponse<String> testAuthHttpBasicWithHttpInfo(Map<String, String> hea
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -312,7 +312,7 @@ public ApiResponse<String> testAuthHttpBearerWithHttpInfo(Map<String, String> he
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
index 09f28077f876..e60ebdc957c8 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
@@ -53,7 +53,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -83,8 +83,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public BodyApi() {
     this(Configuration.getDefaultApiClient());
@@ -219,7 +219,7 @@ public ApiResponse<File> testBinaryGifWithHttpInfo(Map<String, String> headers)
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -331,7 +331,7 @@ public ApiResponse<String> testBodyApplicationOctetstreamBinaryWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -444,7 +444,7 @@ public ApiResponse<String> testBodyMultipartFormdataArrayOfBinaryWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -591,7 +591,7 @@ public ApiResponse<String> testBodyMultipartFormdataSingleBinaryWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -732,7 +732,7 @@ public ApiResponse<Pet> testEchoBodyAllOfPetWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -851,7 +851,7 @@ public ApiResponse<String> testEchoBodyFreeFormObjectResponseStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -964,7 +964,7 @@ public ApiResponse<Pet> testEchoBodyPetWithHttpInfo(@javax.annotation.Nullable P
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1083,7 +1083,7 @@ public ApiResponse<String> testEchoBodyPetResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1196,7 +1196,7 @@ public ApiResponse<StringEnumRef> testEchoBodyStringEnumWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1315,7 +1315,7 @@ public ApiResponse<String> testEchoBodyTagResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
index 19f723768d14..0db44d8c8deb 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FormApi() {
     this(Configuration.getDefaultApiClient());
@@ -228,7 +228,7 @@ public ApiResponse<String> testFormIntegerBooleanStringWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -356,7 +356,7 @@ public ApiResponse<String> testFormObjectMultipartWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -522,7 +522,7 @@ public ApiResponse<String> testFormOneofWithHttpInfo(@javax.annotation.Nullable
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
index a3aafdcb4805..5653446b1f3a 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public HeaderApi() {
     this(Configuration.getDefaultApiClient());
@@ -236,7 +236,7 @@ public ApiResponse<String> testHeaderIntegerBooleanStringEnumsWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
index bfe40c22e00f..115c1c2ce93d 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PathApi() {
     this(Configuration.getDefaultApiClient());
@@ -232,7 +232,7 @@ public ApiResponse<String> testsPathStringPathStringIntegerPathIntegerEnumNonref
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
index 15dc871aebc9..45416ac1d926 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
@@ -56,7 +56,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -86,8 +86,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public QueryApi() {
     this(Configuration.getDefaultApiClient());
@@ -230,7 +230,7 @@ public ApiResponse<String> testEnumRefStringWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -362,7 +362,7 @@ public ApiResponse<String> testQueryDatetimeDateStringWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -496,7 +496,7 @@ public ApiResponse<String> testQueryIntegerBooleanStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -622,7 +622,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -749,7 +749,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHtt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -876,7 +876,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayIntegerWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -998,7 +998,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayStringWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1120,7 +1120,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1242,7 +1242,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1369,7 +1369,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1495,7 +1495,7 @@ public ApiResponse<String> testQueryStyleJsonSerializationObjectWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
index bc6b0758c4d7..aaffda15d819 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md
@@ -4,6 +4,7 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
+| **discriminator** | **kotlin.String** |  |  |
 | **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
index ec471ab303f4..c5bc8ab96395 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md
@@ -5,6 +5,7 @@
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
 | **discriminator** | **kotlin.String** |  |  |
+| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
 | **propertyB** | **kotlin.String** |  |  [optional] |
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
index f979cf3c0690..f42f4e951c03 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md
@@ -4,6 +4,8 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
+| **discriminator** | **kotlin.String** |  |  |
+| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyA** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.Int** |  |  [optional] |
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
index 4cd2eda5662e..8208e46652a2 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md
@@ -4,6 +4,8 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
+| **discriminator** | **kotlin.String** |  |  |
+| **anotherDiscriminator** | **kotlin.String** |  |  |
 | **propertyB** | **kotlin.String** |  |  [optional] |
 | **sameNameProperty** | **kotlin.String** |  |  [optional] |
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
index ec17555c7ead..5daa221dc730 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive
 @Serializable(with = AnimalSerializer::class)
 sealed interface Animal {
     @JvmInline
-     value class (val value: Bird) : Animal
+     value class BirdWrapper(val value: Bird) : Animal
 
     @JvmInline
-     value class (val value: Robobird) : Animal
+     value class RobobirdWrapper(val value: Robobird) : Animal
 
 }
 
@@ -56,12 +56,12 @@ object AnimalSerializer : KSerializer<Animal> {
     override fun serialize(encoder: Encoder, value: Animal) {
         require(encoder is JsonEncoder)
         val jsonObject = when (value) {
-            is Animal. -> {
+            is Animal.BirdWrapper -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["discriminator"] = JsonPrimitive("BIRD")
                 JsonObject(jsonMap)
             }
-            is Animal. -> {
+            is Animal.RobobirdWrapper -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["discriminator"] = JsonPrimitive("ROBOBIRD")
                 JsonObject(jsonMap)
@@ -80,11 +80,11 @@ object AnimalSerializer : KSerializer<Animal> {
         return when (discriminatorValue) {
             "BIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element)
-                Animal.(decoded)
+                Animal.BirdWrapper(decoded)
             }
             "ROBOBIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element)
-                Animal.(decoded)
+                Animal.RobobirdWrapper(decoded)
             }
             else -> throw SerializationException("Unknown Animal discriminator: $discriminatorValue")
         }
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
index cbe63fadb955..4fa0bb4eb937 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt
@@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive
 @Serializable(with = AnotherAnimalSerializer::class)
 sealed interface AnotherAnimal {
     @JvmInline
-     value class (val value: Bird) : AnotherAnimal
+     value class AnotherBirdWrapper(val value: Bird) : AnotherAnimal
 
     @JvmInline
-     value class (val value: Robobird) : AnotherAnimal
+     value class AnotherRobobirdWrapper(val value: Robobird) : AnotherAnimal
 
 }
 
@@ -56,12 +56,12 @@ object AnotherAnimalSerializer : KSerializer<AnotherAnimal> {
     override fun serialize(encoder: Encoder, value: AnotherAnimal) {
         require(encoder is JsonEncoder)
         val jsonObject = when (value) {
-            is AnotherAnimal. -> {
+            is AnotherAnimal.AnotherBirdWrapper -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_BIRD")
                 JsonObject(jsonMap)
             }
-            is AnotherAnimal. -> {
+            is AnotherAnimal.AnotherRobobirdWrapper -> {
                 val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap()
                 jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_ROBOBIRD")
                 JsonObject(jsonMap)
@@ -80,11 +80,11 @@ object AnotherAnimalSerializer : KSerializer<AnotherAnimal> {
         return when (discriminatorValue) {
             "ANOTHER_BIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element)
-                AnotherAnimal.(decoded)
+                AnotherAnimal.AnotherBirdWrapper(decoded)
             }
             "ANOTHER_ROBOBIRD" -> {
                 val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element)
-                AnotherAnimal.(decoded)
+                AnotherAnimal.AnotherRobobirdWrapper(decoded)
             }
             else -> throw SerializationException("Unknown AnotherAnimal another_discriminator: $discriminatorValue")
         }
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
index da1f56ed1c7b..f74aff360a72 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt
@@ -28,14 +28,21 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * 
  *
+ * @param discriminator 
+ * @param anotherDiscriminator 
  * @param propertyA 
  * @param sameNameProperty 
  */
 @Serializable
 
-@SerialName(value = "ANOTHER_BIRD")
 data class Bird (
 
+    @SerialName(value = "discriminator")
+    val discriminator: kotlin.String,
+
+    @SerialName(value = "another_discriminator")
+    val anotherDiscriminator: kotlin.String,
+
     @SerialName(value = "propertyA")
     val propertyA: kotlin.String? = null,
 
diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
index fbeb555149b1..7af01c66bb1a 100644
--- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
+++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt
@@ -28,14 +28,21 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * 
  *
+ * @param discriminator 
+ * @param anotherDiscriminator 
  * @param propertyB 
  * @param sameNameProperty 
  */
 @Serializable
 
-@SerialName(value = "ANOTHER_ROBOBIRD")
 data class Robobird (
 
+    @SerialName(value = "discriminator")
+    val discriminator: kotlin.String,
+
+    @SerialName(value = "another_discriminator")
+    val anotherDiscriminator: kotlin.String,
+
     @SerialName(value = "propertyB")
     val propertyB: kotlin.String? = null,
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
index 5f9d37f7d678..fe7c9c6037c0 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-import java.util.function.UnaryOperator;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,8 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
 
   protected Duration readTimeout;
   protected Duration connectTimeout;
@@ -365,7 +365,7 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -375,7 +375,7 @@ public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -388,7 +388,7 @@ public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -398,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStr
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 744848eeac77..00bb5602063b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -76,8 +76,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AnotherFakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -222,7 +222,7 @@ public CompletableFuture<ApiResponse<Client>> call123testSpecialTagsWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("call123testSpecialTags", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
index 7a72f4eb85b3..22246d735d37 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -76,8 +76,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public DefaultApi() {
     this(Configuration.getDefaultApiClient());
@@ -218,7 +218,7 @@ public CompletableFuture<ApiResponse<FooGetDefaultResponse>> fooGetWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fooGet", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
index e90fa194b1b2..e22f953fa39e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -61,7 +61,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -93,8 +93,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -235,7 +235,7 @@ public CompletableFuture<ApiResponse<FakeBigDecimalMap200Response>> fakeBigDecim
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeBigDecimalMap", localVarResponse));
@@ -353,7 +353,7 @@ public CompletableFuture<ApiResponse<HealthCheckResult>> fakeHealthGetWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeHealthGet", localVarResponse));
@@ -475,7 +475,7 @@ public CompletableFuture<ApiResponse<Boolean>> fakeOuterBooleanSerializeWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterBooleanSerialize", localVarResponse));
@@ -603,7 +603,7 @@ public CompletableFuture<ApiResponse<OuterComposite>> fakeOuterCompositeSerializ
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterCompositeSerialize", localVarResponse));
@@ -731,7 +731,7 @@ public CompletableFuture<ApiResponse<BigDecimal>> fakeOuterNumberSerializeWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterNumberSerialize", localVarResponse));
@@ -859,7 +859,7 @@ public CompletableFuture<ApiResponse<String>> fakeOuterStringSerializeWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterStringSerialize", localVarResponse));
@@ -978,7 +978,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getApplicationJsonUtf8Wit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getApplicationJsonUtf8", localVarResponse));
@@ -1096,7 +1096,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getArrayOfEnumsWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getArrayOfEnums", localVarResponse));
@@ -1218,7 +1218,7 @@ public CompletableFuture<ApiResponse<Void>> testAdditionalPropertiesReferenceWit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testAdditionalPropertiesReference", localVarResponse));
@@ -1335,7 +1335,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithFileSchemaWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithFileSchema", localVarResponse));
@@ -1456,7 +1456,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithQueryParamsWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithQueryParams", localVarResponse));
@@ -1592,7 +1592,7 @@ public CompletableFuture<ApiResponse<Client>> testClientModelWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClientModel", localVarResponse));
@@ -1776,7 +1776,7 @@ public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEndpointParameters", localVarResponse));
@@ -1981,7 +1981,7 @@ public CompletableFuture<ApiResponse<Void>> testEnumParametersWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEnumParameters", localVarResponse));
@@ -2219,7 +2219,7 @@ public CompletableFuture<ApiResponse<Void>> testGroupParametersWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testGroupParameters", localVarResponse));
@@ -2454,7 +2454,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineAdditionalPropertiesWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineAdditionalProperties", localVarResponse));
@@ -2571,7 +2571,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineFreeformAdditionalProperti
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineFreeformAdditionalProperties", localVarResponse));
@@ -2692,7 +2692,7 @@ public CompletableFuture<ApiResponse<Void>> testJsonFormDataWithHttpInfo(@javax.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testJsonFormData", localVarResponse));
@@ -2841,7 +2841,7 @@ public CompletableFuture<ApiResponse<Void>> testQueryParameterCollectionFormatWi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testQueryParameterCollectionFormat", localVarResponse));
@@ -2991,7 +2991,7 @@ public CompletableFuture<ApiResponse<Void>> testStringMapReferenceWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testStringMapReference", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 8f3375ff9ca2..af7af1dc32fc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -82,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeClassnameTags123Api() {
     this(Configuration.getDefaultApiClient());
@@ -228,7 +228,7 @@ public CompletableFuture<ApiResponse<Client>> testClassnameWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClassname", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
index e9de6b7b6220..74c7562d7681 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,7 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -84,8 +84,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -230,7 +230,7 @@ public CompletableFuture<ApiResponse<Void>> addPetWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("addPet", localVarResponse));
@@ -351,7 +351,7 @@ public CompletableFuture<ApiResponse<Void>> deletePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deletePet", localVarResponse));
@@ -466,7 +466,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByStatusWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByStatus", localVarResponse));
@@ -615,7 +615,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByTagsWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByTags", localVarResponse));
@@ -756,7 +756,7 @@ public CompletableFuture<ApiResponse<Pet>> getPetByIdWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getPetById", localVarResponse));
@@ -883,7 +883,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePet", localVarResponse));
@@ -1008,7 +1008,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithFormWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePetWithForm", localVarResponse));
@@ -1146,7 +1146,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFile", localVarResponse));
@@ -1318,7 +1318,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithRequiredFi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFileWithRequiredFile", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
index c26a55b7f8ee..ee05a8deedb7 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -82,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -228,7 +228,7 @@ public CompletableFuture<ApiResponse<Void>> deleteOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteOrder", localVarResponse));
@@ -336,7 +336,7 @@ public CompletableFuture<ApiResponse<Map<String, Integer>>> getInventoryWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getInventory", localVarResponse));
@@ -458,7 +458,7 @@ public CompletableFuture<ApiResponse<Order>> getOrderByIdWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getOrderById", localVarResponse));
@@ -585,7 +585,7 @@ public CompletableFuture<ApiResponse<Order>> placeOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("placeOrder", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
index e4246f96d79f..5cd4ee4e9c77 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,7 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 import java.util.concurrent.CompletableFuture;
@@ -83,8 +83,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -229,7 +229,7 @@ public CompletableFuture<ApiResponse<Void>> createUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUser", localVarResponse));
@@ -346,7 +346,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithArrayInputWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithArrayInput", localVarResponse));
@@ -463,7 +463,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithListInputWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithListInput", localVarResponse));
@@ -580,7 +580,7 @@ public CompletableFuture<ApiResponse<Void>> deleteUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteUser", localVarResponse));
@@ -692,7 +692,7 @@ public CompletableFuture<ApiResponse<User>> getUserByNameWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getUserByName", localVarResponse));
@@ -823,7 +823,7 @@ public CompletableFuture<ApiResponse<String>> loginUserWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("loginUser", localVarResponse));
@@ -966,7 +966,7 @@ public CompletableFuture<ApiResponse<Void>> logoutUserWithHttpInfo(Map<String, S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("logoutUser", localVarResponse));
@@ -1077,7 +1077,7 @@ public CompletableFuture<ApiResponse<Void>> updateUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              memberVarResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updateUser", localVarResponse));
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
index fe2ae1e856aa..cf6c738266a1 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-import java.util.function.UnaryOperator;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,8 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
 
   protected Duration readTimeout;
   protected Duration connectTimeout;
@@ -365,7 +365,7 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -375,7 +375,7 @@ public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -388,7 +388,7 @@ public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -398,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStr
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
index 1198ec745f41..a796158778be 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,7 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -82,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -222,7 +222,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -346,7 +346,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -456,7 +456,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@jakarta.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -596,7 +596,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@jakarta.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -728,7 +728,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -854,7 +854,7 @@ public ApiResponse<Pet> updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -982,7 +982,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@jakarta.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1115,7 +1115,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@jakarta.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
index 0851f2c8c411..a7fcf89d544e 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -217,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -320,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -433,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnull L
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -551,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@jakarta.annotation.Nonnull Ord
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
index 0e72d38330cd..00f020cc51c5 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,7 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -81,8 +81,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -218,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@jakarta.annotation.Nonnull User
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -327,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@jakarta.annotati
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -436,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@jakarta.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -545,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -652,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@jakarta.annotation.Nonnull S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -774,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -905,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1008,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
index fe2ae1e856aa..cf6c738266a1 100644
--- a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-import java.util.function.UnaryOperator;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,8 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
 
   protected Duration readTimeout;
   protected Duration connectTimeout;
@@ -365,7 +365,7 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -375,7 +375,7 @@ public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -388,7 +388,7 @@ public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -398,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStr
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
index 7edefb95a472..e5784d15c148 100644
--- a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -74,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -214,7 +214,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
index 5f9d37f7d678..fe7c9c6037c0 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 import java.util.stream.Collectors;
-import java.util.function.UnaryOperator;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -64,8 +64,8 @@ public class ApiClient {
   protected int port;
   protected String basePath;
   protected Consumer<HttpRequest.Builder> interceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> responseInterceptor;
-  protected UnaryOperator<HttpResponse<InputStream>> asyncResponseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> responseInterceptor;
+  protected Consumer<HttpResponse<InputStream>> asyncResponseInterceptor;
 
   protected Duration readTimeout;
   protected Duration connectTimeout;
@@ -365,7 +365,7 @@ public Consumer<HttpRequest.Builder> getRequestInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.responseInterceptor = interceptor;
     return this;
   }
@@ -375,7 +375,7 @@ public ApiClient setResponseInterceptor(UnaryOperator<HttpResponse<InputStream>>
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getResponseInterceptor() {
     return responseInterceptor;
   }
 
@@ -388,7 +388,7 @@ public UnaryOperator<HttpResponse<InputStream>> getResponseInterceptor() {
    *                    of null resets the interceptor to a no-op.
    * @return This object.
    */
-  public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStream>> interceptor) {
+  public ApiClient setAsyncResponseInterceptor(Consumer<HttpResponse<InputStream>> interceptor) {
     this.asyncResponseInterceptor = interceptor;
     return this;
   }
@@ -398,7 +398,7 @@ public ApiClient setAsyncResponseInterceptor(UnaryOperator<HttpResponse<InputStr
    *
    * @return The custom interceptor that was set, or null if there isn't any.
    */
-  public UnaryOperator<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
+  public Consumer<HttpResponse<InputStream>> getAsyncResponseInterceptor() {
     return asyncResponseInterceptor;
   }
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index ed61cda3d358..38296cdf6584 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -74,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public AnotherFakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -214,7 +214,7 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
index 0f56f1561670..bc05d3842004 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -74,8 +74,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public DefaultApi() {
     this(Configuration.getDefaultApiClient());
@@ -210,7 +210,7 @@ public ApiResponse<FooGetDefaultResponse> fooGetWithHttpInfo(Map<String, String>
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
index d577a73aac29..274ab29dcba2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -61,7 +61,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -91,8 +91,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeApi() {
     this(Configuration.getDefaultApiClient());
@@ -227,7 +227,7 @@ public ApiResponse<FakeBigDecimalMap200Response> fakeBigDecimalMapWithHttpInfo(M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -336,7 +336,7 @@ public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -449,7 +449,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -568,7 +568,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -687,7 +687,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -806,7 +806,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(@javax.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -916,7 +916,7 @@ public ApiResponse<List<OuterEnum>> getApplicationJsonUtf8WithHttpInfo(Map<Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1025,7 +1025,7 @@ public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1135,7 +1135,7 @@ public ApiResponse<Void> testAdditionalPropertiesReferenceWithHttpInfo(@javax.an
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1244,7 +1244,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1357,7 +1357,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1488,7 +1488,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1660,7 +1660,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1857,7 +1857,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2085,7 +2085,7 @@ public ApiResponse<Void> testGroupParametersWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2312,7 +2312,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2421,7 +2421,7 @@ public ApiResponse<Void> testInlineFreeformAdditionalPropertiesWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2534,7 +2534,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2675,7 +2675,7 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2817,7 +2817,7 @@ public ApiResponse<Void> testStringMapReferenceWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 24113fd8dd4e..ec464f0b5a6d 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public FakeClassnameTags123Api() {
     this(Configuration.getDefaultApiClient());
@@ -220,7 +220,7 @@ public ApiResponse<Client> testClassnameWithHttpInfo(@javax.annotation.Nonnull C
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
index e348885ab35c..917d9fafaa9a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -52,7 +52,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -82,8 +82,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public PetApi() {
     this(Configuration.getDefaultApiClient());
@@ -219,7 +219,7 @@ public ApiResponse<Void> addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet, M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -332,7 +332,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -442,7 +442,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@javax.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -582,7 +582,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -714,7 +714,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -829,7 +829,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -946,7 +946,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1079,7 +1079,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1242,7 +1242,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
index 9e2b13a8a3a9..96f5d1cb3193 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -50,7 +50,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -80,8 +80,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public StoreApi() {
     this(Configuration.getDefaultApiClient());
@@ -217,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -320,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -433,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Lon
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -551,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@javax.annotation.Nonnull Order
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
index 22d9aaac26d5..bf7beefe1da2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -51,7 +51,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Locale;
-import java.util.function.UnaryOperator;
+
 import java.util.function.Consumer;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
@@ -81,8 +81,8 @@ static HttpRequest.Builder withAdditionalHeaders(HttpRequest.Builder builder, Ma
   private final String memberVarBaseUri;
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  private final UnaryOperator<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
+  private final Consumer<HttpResponse<InputStream>> memberVarAsyncResponseInterceptor;
 
   public UserApi() {
     this(Configuration.getDefaultApiClient());
@@ -218,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@javax.annotation.Nonnull User u
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -327,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -436,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -545,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -652,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@javax.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -774,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -905,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1008,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+            memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {

From e7b142d3db876b3205232dc092c0984a8a5a1d4f Mon Sep 17 00:00:00 2001
From: Daymon Schodits <daymon.schodits@secunet.com>
Date: Fri, 21 Nov 2025 15:13:10 +0100
Subject: [PATCH 5/5] fixed asyncResponseInterceptor and indentations

---
 .../Java/libraries/native/api.mustache        |  8 ++--
 .../org/openapitools/client/api/AuthApi.java  |  4 +-
 .../org/openapitools/client/api/BodyApi.java  | 20 +++++-----
 .../org/openapitools/client/api/FormApi.java  |  6 +--
 .../openapitools/client/api/HeaderApi.java    |  2 +-
 .../org/openapitools/client/api/PathApi.java  |  2 +-
 .../org/openapitools/client/api/QueryApi.java | 22 +++++-----
 .../client/api/AnotherFakeApi.java            |  2 +-
 .../openapitools/client/api/DefaultApi.java   |  2 +-
 .../org/openapitools/client/api/FakeApi.java  | 40 +++++++++----------
 .../client/api/FakeClassnameTags123Api.java   |  2 +-
 .../org/openapitools/client/api/PetApi.java   | 18 ++++-----
 .../org/openapitools/client/api/StoreApi.java |  8 ++--
 .../org/openapitools/client/api/UserApi.java  | 16 ++++----
 .../org/openapitools/client/api/PetApi.java   | 16 ++++----
 .../org/openapitools/client/api/StoreApi.java |  8 ++--
 .../org/openapitools/client/api/UserApi.java  | 16 ++++----
 .../org/openapitools/client/api/PetApi.java   |  2 +-
 .../client/api/AnotherFakeApi.java            |  2 +-
 .../openapitools/client/api/DefaultApi.java   |  2 +-
 .../org/openapitools/client/api/FakeApi.java  | 40 +++++++++----------
 .../client/api/FakeClassnameTags123Api.java   |  2 +-
 .../org/openapitools/client/api/PetApi.java   | 18 ++++-----
 .../org/openapitools/client/api/StoreApi.java |  8 ++--
 .../org/openapitools/client/api/UserApi.java  | 16 ++++----
 25 files changed, 141 insertions(+), 141 deletions(-)

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 36e24636aed7..7fb66dd22169 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
@@ -441,10 +441,10 @@ public class {{classname}} {
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         {{#useUnaryInterceptor}}
-            localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+        localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
         {{/useUnaryInterceptor}}
         {{^useUnaryInterceptor}}
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
         {{/useUnaryInterceptor}}
       }
       InputStream localVarResponseBody = null;
@@ -539,10 +539,10 @@ public class {{classname}} {
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
               {{#useUnaryInterceptor}}
-              localVarResponse = memberVarResponseInterceptor.apply(localVarResponse);
+              localVarResponse = memberVarAsyncResponseInterceptor.apply(localVarResponse);
               {{/useUnaryInterceptor}}
               {{^useUnaryInterceptor}}
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
               {{/useUnaryInterceptor}}
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
index 980e9b2e509f..16b80f7ed0b8 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
@@ -209,7 +209,7 @@ public ApiResponse<String> testAuthHttpBasicWithHttpInfo(Map<String, String> hea
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -312,7 +312,7 @@ public ApiResponse<String> testAuthHttpBearerWithHttpInfo(Map<String, String> he
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
index e60ebdc957c8..ea1d924166d6 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
@@ -219,7 +219,7 @@ public ApiResponse<File> testBinaryGifWithHttpInfo(Map<String, String> headers)
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -331,7 +331,7 @@ public ApiResponse<String> testBodyApplicationOctetstreamBinaryWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -444,7 +444,7 @@ public ApiResponse<String> testBodyMultipartFormdataArrayOfBinaryWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -591,7 +591,7 @@ public ApiResponse<String> testBodyMultipartFormdataSingleBinaryWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -732,7 +732,7 @@ public ApiResponse<Pet> testEchoBodyAllOfPetWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -851,7 +851,7 @@ public ApiResponse<String> testEchoBodyFreeFormObjectResponseStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -964,7 +964,7 @@ public ApiResponse<Pet> testEchoBodyPetWithHttpInfo(@javax.annotation.Nullable P
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1083,7 +1083,7 @@ public ApiResponse<String> testEchoBodyPetResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1196,7 +1196,7 @@ public ApiResponse<StringEnumRef> testEchoBodyStringEnumWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1315,7 +1315,7 @@ public ApiResponse<String> testEchoBodyTagResponseStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
index 0db44d8c8deb..8d842ed8187d 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
@@ -228,7 +228,7 @@ public ApiResponse<String> testFormIntegerBooleanStringWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -356,7 +356,7 @@ public ApiResponse<String> testFormObjectMultipartWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -522,7 +522,7 @@ public ApiResponse<String> testFormOneofWithHttpInfo(@javax.annotation.Nullable
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
index 5653446b1f3a..fcec5febaeea 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
@@ -236,7 +236,7 @@ public ApiResponse<String> testHeaderIntegerBooleanStringEnumsWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
index 115c1c2ce93d..6eb9581383cb 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
@@ -232,7 +232,7 @@ public ApiResponse<String> testsPathStringPathStringIntegerPathIntegerEnumNonref
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
index 45416ac1d926..59a38b1cc6ea 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
@@ -230,7 +230,7 @@ public ApiResponse<String> testEnumRefStringWithHttpInfo(@javax.annotation.Nulla
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -362,7 +362,7 @@ public ApiResponse<String> testQueryDatetimeDateStringWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -496,7 +496,7 @@ public ApiResponse<String> testQueryIntegerBooleanStringWithHttpInfo(@javax.anno
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -622,7 +622,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -749,7 +749,7 @@ public ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHtt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -876,7 +876,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayIntegerWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -998,7 +998,7 @@ public ApiResponse<String> testQueryStyleFormExplodeFalseArrayStringWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1120,7 +1120,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1242,7 +1242,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1369,7 +1369,7 @@ public ApiResponse<String> testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1495,7 +1495,7 @@ public ApiResponse<String> testQueryStyleJsonSerializationObjectWithHttpInfo(@ja
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 00bb5602063b..82ad53ed02b3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -222,7 +222,7 @@ public CompletableFuture<ApiResponse<Client>> call123testSpecialTagsWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("call123testSpecialTags", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
index 22246d735d37..2a933f54bab1 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -218,7 +218,7 @@ public CompletableFuture<ApiResponse<FooGetDefaultResponse>> fooGetWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fooGet", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
index e22f953fa39e..3bf44df8429e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -235,7 +235,7 @@ public CompletableFuture<ApiResponse<FakeBigDecimalMap200Response>> fakeBigDecim
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeBigDecimalMap", localVarResponse));
@@ -353,7 +353,7 @@ public CompletableFuture<ApiResponse<HealthCheckResult>> fakeHealthGetWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeHealthGet", localVarResponse));
@@ -475,7 +475,7 @@ public CompletableFuture<ApiResponse<Boolean>> fakeOuterBooleanSerializeWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterBooleanSerialize", localVarResponse));
@@ -603,7 +603,7 @@ public CompletableFuture<ApiResponse<OuterComposite>> fakeOuterCompositeSerializ
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterCompositeSerialize", localVarResponse));
@@ -731,7 +731,7 @@ public CompletableFuture<ApiResponse<BigDecimal>> fakeOuterNumberSerializeWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterNumberSerialize", localVarResponse));
@@ -859,7 +859,7 @@ public CompletableFuture<ApiResponse<String>> fakeOuterStringSerializeWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("fakeOuterStringSerialize", localVarResponse));
@@ -978,7 +978,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getApplicationJsonUtf8Wit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getApplicationJsonUtf8", localVarResponse));
@@ -1096,7 +1096,7 @@ public CompletableFuture<ApiResponse<List<OuterEnum>>> getArrayOfEnumsWithHttpIn
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getArrayOfEnums", localVarResponse));
@@ -1218,7 +1218,7 @@ public CompletableFuture<ApiResponse<Void>> testAdditionalPropertiesReferenceWit
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testAdditionalPropertiesReference", localVarResponse));
@@ -1335,7 +1335,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithFileSchemaWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithFileSchema", localVarResponse));
@@ -1456,7 +1456,7 @@ public CompletableFuture<ApiResponse<Void>> testBodyWithQueryParamsWithHttpInfo(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testBodyWithQueryParams", localVarResponse));
@@ -1592,7 +1592,7 @@ public CompletableFuture<ApiResponse<Client>> testClientModelWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClientModel", localVarResponse));
@@ -1776,7 +1776,7 @@ public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEndpointParameters", localVarResponse));
@@ -1981,7 +1981,7 @@ public CompletableFuture<ApiResponse<Void>> testEnumParametersWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testEnumParameters", localVarResponse));
@@ -2219,7 +2219,7 @@ public CompletableFuture<ApiResponse<Void>> testGroupParametersWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testGroupParameters", localVarResponse));
@@ -2454,7 +2454,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineAdditionalPropertiesWithHt
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineAdditionalProperties", localVarResponse));
@@ -2571,7 +2571,7 @@ public CompletableFuture<ApiResponse<Void>> testInlineFreeformAdditionalProperti
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testInlineFreeformAdditionalProperties", localVarResponse));
@@ -2692,7 +2692,7 @@ public CompletableFuture<ApiResponse<Void>> testJsonFormDataWithHttpInfo(@javax.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testJsonFormData", localVarResponse));
@@ -2841,7 +2841,7 @@ public CompletableFuture<ApiResponse<Void>> testQueryParameterCollectionFormatWi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testQueryParameterCollectionFormat", localVarResponse));
@@ -2991,7 +2991,7 @@ public CompletableFuture<ApiResponse<Void>> testStringMapReferenceWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testStringMapReference", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index af7af1dc32fc..0e462c71f958 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -228,7 +228,7 @@ public CompletableFuture<ApiResponse<Client>> testClassnameWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("testClassname", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
index 74c7562d7681..943d4abd5fd4 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
@@ -230,7 +230,7 @@ public CompletableFuture<ApiResponse<Void>> addPetWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("addPet", localVarResponse));
@@ -351,7 +351,7 @@ public CompletableFuture<ApiResponse<Void>> deletePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deletePet", localVarResponse));
@@ -466,7 +466,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByStatusWithHttpInfo(@j
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByStatus", localVarResponse));
@@ -615,7 +615,7 @@ public CompletableFuture<ApiResponse<List<Pet>>> findPetsByTagsWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("findPetsByTags", localVarResponse));
@@ -756,7 +756,7 @@ public CompletableFuture<ApiResponse<Pet>> getPetByIdWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getPetById", localVarResponse));
@@ -883,7 +883,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePet", localVarResponse));
@@ -1008,7 +1008,7 @@ public CompletableFuture<ApiResponse<Void>> updatePetWithFormWithHttpInfo(@javax
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updatePetWithForm", localVarResponse));
@@ -1146,7 +1146,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithHttpInfo(@
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFile", localVarResponse));
@@ -1318,7 +1318,7 @@ public CompletableFuture<ApiResponse<ModelApiResponse>> uploadFileWithRequiredFi
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("uploadFileWithRequiredFile", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
index ee05a8deedb7..bd5aaa274dc5 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -228,7 +228,7 @@ public CompletableFuture<ApiResponse<Void>> deleteOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteOrder", localVarResponse));
@@ -336,7 +336,7 @@ public CompletableFuture<ApiResponse<Map<String, Integer>>> getInventoryWithHttp
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getInventory", localVarResponse));
@@ -458,7 +458,7 @@ public CompletableFuture<ApiResponse<Order>> getOrderByIdWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getOrderById", localVarResponse));
@@ -585,7 +585,7 @@ public CompletableFuture<ApiResponse<Order>> placeOrderWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("placeOrder", localVarResponse));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
index 5cd4ee4e9c77..36b4519a5832 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
@@ -229,7 +229,7 @@ public CompletableFuture<ApiResponse<Void>> createUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUser", localVarResponse));
@@ -346,7 +346,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithArrayInputWithHttpInf
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithArrayInput", localVarResponse));
@@ -463,7 +463,7 @@ public CompletableFuture<ApiResponse<Void>> createUsersWithListInputWithHttpInfo
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("createUsersWithListInput", localVarResponse));
@@ -580,7 +580,7 @@ public CompletableFuture<ApiResponse<Void>> deleteUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("deleteUser", localVarResponse));
@@ -692,7 +692,7 @@ public CompletableFuture<ApiResponse<User>> getUserByNameWithHttpInfo(@javax.ann
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("getUserByName", localVarResponse));
@@ -823,7 +823,7 @@ public CompletableFuture<ApiResponse<String>> loginUserWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("loginUser", localVarResponse));
@@ -966,7 +966,7 @@ public CompletableFuture<ApiResponse<Void>> logoutUserWithHttpInfo(Map<String, S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("logoutUser", localVarResponse));
@@ -1077,7 +1077,7 @@ public CompletableFuture<ApiResponse<Void>> updateUserWithHttpInfo(@javax.annota
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream()).thenComposeAsync(localVarResponse -> {
             if (memberVarAsyncResponseInterceptor != null) {
-              memberVarResponseInterceptor.accept(localVarResponse);
+              memberVarAsyncResponseInterceptor.accept(localVarResponse);
             }
             if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(getApiException("updateUser", localVarResponse));
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
index a796158778be..c655e2ab5145 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
@@ -222,7 +222,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -346,7 +346,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -456,7 +456,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@jakarta.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -596,7 +596,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@jakarta.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -728,7 +728,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Long
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -854,7 +854,7 @@ public ApiResponse<Pet> updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -982,7 +982,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@jakarta.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1115,7 +1115,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@jakarta.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
index a7fcf89d544e..0db6dd0999a6 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -217,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -320,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -433,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnull L
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -551,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@jakarta.annotation.Nonnull Ord
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
index 00f020cc51c5..c48d29ecc789 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
@@ -218,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@jakarta.annotation.Nonnull User
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -327,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@jakarta.annotati
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -436,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@jakarta.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -545,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -652,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@jakarta.annotation.Nonnull S
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -774,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@jakarta.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -905,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1008,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@jakarta.annotation.Nonnull Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
index e5784d15c148..a007929a53e6 100644
--- a/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-useGzipFeature/src/main/java/org/openapitools/client/api/PetApi.java
@@ -214,7 +214,7 @@ public ApiResponse<Pet> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet,
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 38296cdf6584..9c5880a01b15 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -214,7 +214,7 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
index bc05d3842004..054d8ff443c3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -210,7 +210,7 @@ public ApiResponse<FooGetDefaultResponse> fooGetWithHttpInfo(Map<String, String>
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
index 274ab29dcba2..e492f3e9d799 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -227,7 +227,7 @@ public ApiResponse<FakeBigDecimalMap200Response> fakeBigDecimalMapWithHttpInfo(M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -336,7 +336,7 @@ public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -449,7 +449,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(@javax.annotat
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -568,7 +568,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(@java
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -687,7 +687,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -806,7 +806,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(@javax.annotatio
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -916,7 +916,7 @@ public ApiResponse<List<OuterEnum>> getApplicationJsonUtf8WithHttpInfo(Map<Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1025,7 +1025,7 @@ public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo(Map<String, Stri
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1135,7 +1135,7 @@ public ApiResponse<Void> testAdditionalPropertiesReferenceWithHttpInfo(@javax.an
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1244,7 +1244,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1357,7 +1357,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.N
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1488,7 +1488,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1660,7 +1660,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1857,7 +1857,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2085,7 +2085,7 @@ public ApiResponse<Void> testGroupParametersWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2312,7 +2312,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(@javax.annot
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2421,7 +2421,7 @@ public ApiResponse<Void> testInlineFreeformAdditionalPropertiesWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2534,7 +2534,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2675,7 +2675,7 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@javax.a
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -2817,7 +2817,7 @@ public ApiResponse<Void> testStringMapReferenceWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index ec464f0b5a6d..44140e846548 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -220,7 +220,7 @@ public ApiResponse<Client> testClassnameWithHttpInfo(@javax.annotation.Nonnull C
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
index 917d9fafaa9a..824291708471 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -219,7 +219,7 @@ public ApiResponse<Void> addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet, M
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -332,7 +332,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -442,7 +442,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@javax.annotation.Non
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -582,7 +582,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnu
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -714,7 +714,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long pe
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -829,7 +829,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -946,7 +946,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1079,7 +1079,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(@javax.annotation.No
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1242,7 +1242,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(@jav
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
index 96f5d1cb3193..f974ed03d38c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -217,7 +217,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -320,7 +320,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo(Map<String, St
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -433,7 +433,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Lon
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -551,7 +551,7 @@ public ApiResponse<Order> placeOrderWithHttpInfo(@javax.annotation.Nonnull Order
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
index bf7beefe1da2..8195f19916e8 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -218,7 +218,7 @@ public ApiResponse<Void> createUserWithHttpInfo(@javax.annotation.Nonnull User u
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -327,7 +327,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(@javax.annotation
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -436,7 +436,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(@javax.annotation.
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -545,7 +545,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -652,7 +652,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(@javax.annotation.Nonnull Str
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -774,7 +774,7 @@ public ApiResponse<String> loginUserWithHttpInfo(@javax.annotation.Nonnull Strin
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -905,7 +905,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo(Map<String, String> headers) thr
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {
@@ -1008,7 +1008,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(@javax.annotation.Nonnull String
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
-            memberVarResponseInterceptor.accept(localVarResponse);
+        memberVarResponseInterceptor.accept(localVarResponse);
       }
       InputStream localVarResponseBody = null;
       try {