From 1833d9220ce0db752fe91245502f882a3fa6865a Mon Sep 17 00:00:00 2001
From: Reilly Brogan <reilly@reillybrogan.com>
Date: Mon, 19 Oct 2026 17:45:00 -0500
Subject: [PATCH] [JAVA][FEIGN] Remove deprecated QueryMap encoded parameter

`encoded` has been deprecated since Feign 10.7 (Nov 2019) and no longer does anything.

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
---
 .../Java/libraries/feign/api.mustache         |  4 +-
 .../org/openapitools/client/api/QueryApi.java | 44 +++++++++----------
 .../org/openapitools/client/api/FakeApi.java  | 20 ++++-----
 .../org/openapitools/client/api/PetApi.java   |  8 ++--
 .../org/openapitools/client/api/UserApi.java  |  4 +-
 .../org/openapitools/client/api/FakeApi.java  | 16 +++----
 .../org/openapitools/client/api/PetApi.java   |  8 ++--
 .../org/openapitools/client/api/UserApi.java  |  4 +-
 .../org/openapitools/client/api/FakeApi.java  | 20 ++++-----
 .../org/openapitools/client/api/PetApi.java   |  8 ++--
 .../org/openapitools/client/api/UserApi.java  |  4 +-
 11 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
index 8e072e86cbc1..fd660d4c5510 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache
@@ -128,7 +128,7 @@ public interface {{classname}} extends ApiClient.Api {
       "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{^-last}},
       {{/-last}}{{/headerParams}}
   })
-  {{#returnType}}{{{.}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^isFormParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isFormParam}}{{#isFormParam}}@Param("{{baseName}}") {{/isFormParam}}{{/isBodyParam}}{{>nullable_var_annotations}} {{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap(encoded=true) {{operationIdCamelCase}}QueryParams queryParams);
+  {{#returnType}}{{{.}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^isFormParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isFormParam}}{{#isFormParam}}@Param("{{baseName}}") {{/isFormParam}}{{/isBodyParam}}{{>nullable_var_annotations}} {{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap {{operationIdCamelCase}}QueryParams queryParams);
 
   /**
   * {{summary}}
@@ -168,7 +168,7 @@ public interface {{classname}} extends ApiClient.Api {
           "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{^-last}},
       {{/-last}}{{/headerParams}}
       })
-   ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{nickname}}WithHttpInfo({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^isFormParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isFormParam}}{{#isFormParam}}@Param("{{baseName}}") {{/isFormParam}}{{/isBodyParam}}{{>nullable_var_annotations}} {{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap(encoded=true) {{operationIdCamelCase}}QueryParams queryParams);
+   ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{nickname}}WithHttpInfo({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^isFormParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isFormParam}}{{#isFormParam}}@Param("{{baseName}}") {{/isFormParam}}{{/isBodyParam}}{{>nullable_var_annotations}} {{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap {{operationIdCamelCase}}QueryParams queryParams);
 
 
    /**
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/QueryApi.java
index ebd7bbd0ebbc..e29e9c22cb00 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/QueryApi.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/QueryApi.java
@@ -70,7 +70,7 @@ public interface QueryApi extends ApiClient.Api {
   @Headers({
   "Accept: text/plain",
   })
-  String testEnumRefString(@QueryMap(encoded=true) TestEnumRefStringQueryParams queryParams);
+  String testEnumRefString(@QueryMap TestEnumRefStringQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -89,7 +89,7 @@ public interface QueryApi extends ApiClient.Api {
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testEnumRefStringWithHttpInfo(@QueryMap(encoded=true) TestEnumRefStringQueryParams queryParams);
+   ApiResponse<String> testEnumRefStringWithHttpInfo(@QueryMap TestEnumRefStringQueryParams queryParams);
 
 
    /**
@@ -158,7 +158,7 @@ public TestEnumRefStringQueryParams enumRefStringQuery(@javax.annotation.Nullabl
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryDatetimeDateString(@QueryMap(encoded=true) TestQueryDatetimeDateStringQueryParams queryParams);
+  String testQueryDatetimeDateString(@QueryMap TestQueryDatetimeDateStringQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -178,7 +178,7 @@ public TestEnumRefStringQueryParams enumRefStringQuery(@javax.annotation.Nullabl
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryDatetimeDateStringWithHttpInfo(@QueryMap(encoded=true) TestQueryDatetimeDateStringQueryParams queryParams);
+   ApiResponse<String> testQueryDatetimeDateStringWithHttpInfo(@QueryMap TestQueryDatetimeDateStringQueryParams queryParams);
 
 
    /**
@@ -251,7 +251,7 @@ public TestQueryDatetimeDateStringQueryParams stringQuery(@javax.annotation.Null
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryIntegerBooleanString(@QueryMap(encoded=true) TestQueryIntegerBooleanStringQueryParams queryParams);
+  String testQueryIntegerBooleanString(@QueryMap TestQueryIntegerBooleanStringQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -271,7 +271,7 @@ public TestQueryDatetimeDateStringQueryParams stringQuery(@javax.annotation.Null
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryIntegerBooleanStringWithHttpInfo(@QueryMap(encoded=true) TestQueryIntegerBooleanStringQueryParams queryParams);
+   ApiResponse<String> testQueryIntegerBooleanStringWithHttpInfo(@QueryMap TestQueryIntegerBooleanStringQueryParams queryParams);
 
 
    /**
@@ -338,7 +338,7 @@ public TestQueryIntegerBooleanStringQueryParams stringQuery(@javax.annotation.Nu
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleDeepObjectExplodeTrueObject(@QueryMap(encoded=true) TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryParams);
+  String testQueryStyleDeepObjectExplodeTrueObject(@QueryMap TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -356,7 +356,7 @@ public TestQueryIntegerBooleanStringQueryParams stringQuery(@javax.annotation.Nu
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryParams);
+   ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo(@QueryMap TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryParams);
 
 
    /**
@@ -415,7 +415,7 @@ public TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryObject(@javax.a
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleDeepObjectExplodeTrueObjectAllOf(@QueryMap(encoded=true) TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryParams);
+  String testQueryStyleDeepObjectExplodeTrueObjectAllOf(@QueryMap TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -433,7 +433,7 @@ public TestQueryStyleDeepObjectExplodeTrueObjectQueryParams queryObject(@javax.a
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryParams);
+   ApiResponse<String> testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHttpInfo(@QueryMap TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryParams);
 
 
    /**
@@ -492,7 +492,7 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryObject(@ja
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleFormExplodeFalseArrayInteger(@QueryMap(encoded=true) TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryParams);
+  String testQueryStyleFormExplodeFalseArrayInteger(@QueryMap TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -510,7 +510,7 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryParams queryObject(@ja
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleFormExplodeFalseArrayIntegerWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryParams);
+   ApiResponse<String> testQueryStyleFormExplodeFalseArrayIntegerWithHttpInfo(@QueryMap TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryParams);
 
 
    /**
@@ -569,7 +569,7 @@ public TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryObject(@javax.
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleFormExplodeFalseArrayString(@QueryMap(encoded=true) TestQueryStyleFormExplodeFalseArrayStringQueryParams queryParams);
+  String testQueryStyleFormExplodeFalseArrayString(@QueryMap TestQueryStyleFormExplodeFalseArrayStringQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -587,7 +587,7 @@ public TestQueryStyleFormExplodeFalseArrayIntegerQueryParams queryObject(@javax.
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleFormExplodeFalseArrayStringWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleFormExplodeFalseArrayStringQueryParams queryParams);
+   ApiResponse<String> testQueryStyleFormExplodeFalseArrayStringWithHttpInfo(@QueryMap TestQueryStyleFormExplodeFalseArrayStringQueryParams queryParams);
 
 
    /**
@@ -646,7 +646,7 @@ public TestQueryStyleFormExplodeFalseArrayStringQueryParams queryObject(@javax.a
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleFormExplodeTrueArrayString(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueArrayStringQueryParams queryParams);
+  String testQueryStyleFormExplodeTrueArrayString(@QueryMap TestQueryStyleFormExplodeTrueArrayStringQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -664,7 +664,7 @@ public TestQueryStyleFormExplodeFalseArrayStringQueryParams queryObject(@javax.a
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueArrayStringQueryParams queryParams);
+   ApiResponse<String> testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(@QueryMap TestQueryStyleFormExplodeTrueArrayStringQueryParams queryParams);
 
 
    /**
@@ -723,7 +723,7 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryParams queryObject(@javax.an
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleFormExplodeTrueObject(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueObjectQueryParams queryParams);
+  String testQueryStyleFormExplodeTrueObject(@QueryMap TestQueryStyleFormExplodeTrueObjectQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -741,7 +741,7 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryParams queryObject(@javax.an
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleFormExplodeTrueObjectWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueObjectQueryParams queryParams);
+   ApiResponse<String> testQueryStyleFormExplodeTrueObjectWithHttpInfo(@QueryMap TestQueryStyleFormExplodeTrueObjectQueryParams queryParams);
 
 
    /**
@@ -800,7 +800,7 @@ public TestQueryStyleFormExplodeTrueObjectQueryParams queryObject(@javax.annotat
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleFormExplodeTrueObjectAllOf(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryParams);
+  String testQueryStyleFormExplodeTrueObjectAllOf(@QueryMap TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -818,7 +818,7 @@ public TestQueryStyleFormExplodeTrueObjectQueryParams queryObject(@javax.annotat
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryParams);
+   ApiResponse<String> testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(@QueryMap TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryParams);
 
 
    /**
@@ -880,7 +880,7 @@ public TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryObject(@javax.an
   @Headers({
   "Accept: text/plain",
   })
-  String testQueryStyleJsonSerializationObject(@QueryMap(encoded=true) TestQueryStyleJsonSerializationObjectQueryParams queryParams);
+  String testQueryStyleJsonSerializationObject(@QueryMap TestQueryStyleJsonSerializationObjectQueryParams queryParams);
 
   /**
   * Test query parameter(s)
@@ -899,7 +899,7 @@ public TestQueryStyleFormExplodeTrueObjectAllOfQueryParams queryObject(@javax.an
       @Headers({
     "Accept: text/plain",
       })
-   ApiResponse<String> testQueryStyleJsonSerializationObjectWithHttpInfo(@QueryMap(encoded=true) TestQueryStyleJsonSerializationObjectQueryParams queryParams);
+   ApiResponse<String> testQueryStyleJsonSerializationObjectWithHttpInfo(@QueryMap TestQueryStyleJsonSerializationObjectQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
index 9ee894e6ec47..083787a15b1a 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -134,7 +134,7 @@ public interface FakeApi extends ApiClient.Api {
   "Accept: application/json",
       "header_1: {header1}"
   })
-  void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
+  void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap FakeHttpSignatureTestQueryParams queryParams);
 
   /**
   * test http signature authentication
@@ -155,7 +155,7 @@ public interface FakeApi extends ApiClient.Api {
     "Accept: application/json",
           "header_1: {header1}"
       })
-   ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
+   ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap FakeHttpSignatureTestQueryParams queryParams);
 
 
    /**
@@ -443,7 +443,7 @@ public FakeHttpSignatureTestQueryParams query1(@javax.annotation.Nullable final
   "Content-Type: application/json",
   "Accept: application/json",
   })
-  void testBodyWithQueryParams(@javax.annotation.Nonnull User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+  void testBodyWithQueryParams(@javax.annotation.Nonnull User user, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
   /**
   * 
@@ -462,7 +462,7 @@ public FakeHttpSignatureTestQueryParams query1(@javax.annotation.Nullable final
     "Content-Type: application/json",
     "Accept: application/json",
       })
-   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User user, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
 
    /**
@@ -636,7 +636,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
       "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
   /**
   * To test enum parameters
@@ -665,7 +665,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
           "enum_header_string: {enumHeaderString}"
       })
-   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
 
    /**
@@ -761,7 +761,7 @@ public TestEnumParametersQueryParams enumQueryModelArray(@javax.annotation.Nulla
       
       "boolean_group: {booleanGroup}"
   })
-  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
   /**
   * Fake endpoint to test group parameters (optional)
@@ -786,7 +786,7 @@ public TestEnumParametersQueryParams enumQueryModelArray(@javax.annotation.Nulla
       
           "boolean_group: {booleanGroup}"
       })
-   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
 
    /**
@@ -982,7 +982,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
   @Headers({
   "Accept: application/json",
   })
-  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+  void testQueryParameterCollectionFormat(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
   /**
   * 
@@ -1005,7 +1005,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
       @Headers({
     "Accept: application/json",
       })
-   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/PetApi.java
index f79d4272d5b1..c9d917455d83 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/PetApi.java
@@ -120,7 +120,7 @@ public interface PetApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  List<Pet> findPetsByStatus(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+  List<Pet> findPetsByStatus(@QueryMap FindPetsByStatusQueryParams queryParams);
 
   /**
   * Finds Pets by status
@@ -138,7 +138,7 @@ public interface PetApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap FindPetsByStatusQueryParams queryParams);
 
 
    /**
@@ -203,7 +203,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
   @Headers({
   "Accept: application/json,application/xml",
   })
-  Set<Pet> findPetsByTags(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+  Set<Pet> findPetsByTags(@QueryMap FindPetsByTagsQueryParams queryParams);
 
   /**
   * Finds Pets by tags
@@ -223,7 +223,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap FindPetsByTagsQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/UserApi.java
index 3c6edc9b992d..e2604054ae9e 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/UserApi.java
@@ -198,7 +198,7 @@ public interface UserApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  String loginUser(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+  String loginUser(@QueryMap LoginUserQueryParams queryParams);
 
   /**
   * Logs user into the system
@@ -217,7 +217,7 @@ public interface UserApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<String> loginUserWithHttpInfo(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+   ApiResponse<String> loginUserWithHttpInfo(@QueryMap LoginUserQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
index 4e522751611f..780bce862a2a 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -242,7 +242,7 @@ public interface FakeApi extends ApiClient.Api {
   "Content-Type: application/json",
   "Accept: application/json",
   })
-  void testBodyWithQueryParams(@javax.annotation.Nonnull User body, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+  void testBodyWithQueryParams(@javax.annotation.Nonnull User body, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
   /**
   * 
@@ -261,7 +261,7 @@ public interface FakeApi extends ApiClient.Api {
     "Content-Type: application/json",
     "Accept: application/json",
       })
-   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User body, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User body, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
 
    /**
@@ -432,7 +432,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
       "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
   /**
   * To test enum parameters
@@ -460,7 +460,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
           "enum_header_string: {enumHeaderString}"
       })
-   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
 
    /**
@@ -552,7 +552,7 @@ public TestEnumParametersQueryParams enumQueryDouble(@javax.annotation.Nullable
       
       "boolean_group: {booleanGroup}"
   })
-  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
   /**
   * Fake endpoint to test group parameters (optional)
@@ -577,7 +577,7 @@ public TestEnumParametersQueryParams enumQueryDouble(@javax.annotation.Nullable
       
           "boolean_group: {booleanGroup}"
       })
-   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
 
    /**
@@ -713,7 +713,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
   @Headers({
   "Accept: application/json",
   })
-  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+  void testQueryParameterCollectionFormat(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
   /**
   * 
@@ -734,7 +734,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
       @Headers({
     "Accept: application/json",
       })
-   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/PetApi.java
index f9c070e01a49..a293f5a1598e 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/PetApi.java
@@ -120,7 +120,7 @@ public interface PetApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  List<Pet> findPetsByStatus(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+  List<Pet> findPetsByStatus(@QueryMap FindPetsByStatusQueryParams queryParams);
 
   /**
   * Finds Pets by status
@@ -138,7 +138,7 @@ public interface PetApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap FindPetsByStatusQueryParams queryParams);
 
 
    /**
@@ -203,7 +203,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
   @Headers({
   "Accept: application/json,application/xml",
   })
-  Set<Pet> findPetsByTags(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+  Set<Pet> findPetsByTags(@QueryMap FindPetsByTagsQueryParams queryParams);
 
   /**
   * Finds Pets by tags
@@ -223,7 +223,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap FindPetsByTagsQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/UserApi.java
index bb14c81f0312..07e19c8a8816 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/UserApi.java
@@ -198,7 +198,7 @@ public interface UserApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  String loginUser(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+  String loginUser(@QueryMap LoginUserQueryParams queryParams);
 
   /**
   * Logs user into the system
@@ -217,7 +217,7 @@ public interface UserApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<String> loginUserWithHttpInfo(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+   ApiResponse<String> loginUserWithHttpInfo(@QueryMap LoginUserQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
index 9ee894e6ec47..083787a15b1a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -134,7 +134,7 @@ public interface FakeApi extends ApiClient.Api {
   "Accept: application/json",
       "header_1: {header1}"
   })
-  void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
+  void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap FakeHttpSignatureTestQueryParams queryParams);
 
   /**
   * test http signature authentication
@@ -155,7 +155,7 @@ public interface FakeApi extends ApiClient.Api {
     "Accept: application/json",
           "header_1: {header1}"
       })
-   ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
+   ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @Param("header1") @javax.annotation.Nullable String header1, @QueryMap FakeHttpSignatureTestQueryParams queryParams);
 
 
    /**
@@ -443,7 +443,7 @@ public FakeHttpSignatureTestQueryParams query1(@javax.annotation.Nullable final
   "Content-Type: application/json",
   "Accept: application/json",
   })
-  void testBodyWithQueryParams(@javax.annotation.Nonnull User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+  void testBodyWithQueryParams(@javax.annotation.Nonnull User user, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
   /**
   * 
@@ -462,7 +462,7 @@ public FakeHttpSignatureTestQueryParams query1(@javax.annotation.Nullable final
     "Content-Type: application/json",
     "Accept: application/json",
       })
-   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
+   ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull User user, @QueryMap TestBodyWithQueryParamsQueryParams queryParams);
 
 
    /**
@@ -636,7 +636,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
       "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
   /**
   * To test enum parameters
@@ -665,7 +665,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
           "enum_header_string: {enumHeaderString}"
       })
-   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap TestEnumParametersQueryParams queryParams);
 
 
    /**
@@ -761,7 +761,7 @@ public TestEnumParametersQueryParams enumQueryModelArray(@javax.annotation.Nulla
       
       "boolean_group: {booleanGroup}"
   })
-  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+  void testGroupParameters(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
   /**
   * Fake endpoint to test group parameters (optional)
@@ -786,7 +786,7 @@ public TestEnumParametersQueryParams enumQueryModelArray(@javax.annotation.Nulla
       
           "boolean_group: {booleanGroup}"
       })
-   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
+   ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") @javax.annotation.Nonnull Boolean requiredBooleanGroup, @Param("booleanGroup") @javax.annotation.Nullable Boolean booleanGroup, @QueryMap TestGroupParametersQueryParams queryParams);
 
 
    /**
@@ -982,7 +982,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
   @Headers({
   "Accept: application/json",
   })
-  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+  void testQueryParameterCollectionFormat(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
   /**
   * 
@@ -1005,7 +1005,7 @@ public TestGroupParametersQueryParams int64Group(@javax.annotation.Nullable fina
       @Headers({
     "Accept: application/json",
       })
-   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
+   ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap TestQueryParameterCollectionFormatQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
index f79d4272d5b1..c9d917455d83 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
@@ -120,7 +120,7 @@ public interface PetApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  List<Pet> findPetsByStatus(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+  List<Pet> findPetsByStatus(@QueryMap FindPetsByStatusQueryParams queryParams);
 
   /**
   * Finds Pets by status
@@ -138,7 +138,7 @@ public interface PetApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
+   ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap FindPetsByStatusQueryParams queryParams);
 
 
    /**
@@ -203,7 +203,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
   @Headers({
   "Accept: application/json,application/xml",
   })
-  Set<Pet> findPetsByTags(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+  Set<Pet> findPetsByTags(@QueryMap FindPetsByTagsQueryParams queryParams);
 
   /**
   * Finds Pets by tags
@@ -223,7 +223,7 @@ public FindPetsByStatusQueryParams status(@javax.annotation.Nonnull final List<S
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
+   ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap FindPetsByTagsQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java
index 3c6edc9b992d..e2604054ae9e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java
@@ -198,7 +198,7 @@ public interface UserApi extends ApiClient.Api {
   @Headers({
   "Accept: application/json,application/xml",
   })
-  String loginUser(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+  String loginUser(@QueryMap LoginUserQueryParams queryParams);
 
   /**
   * Logs user into the system
@@ -217,7 +217,7 @@ public interface UserApi extends ApiClient.Api {
       @Headers({
     "Accept: application/json,application/xml",
       })
-   ApiResponse<String> loginUserWithHttpInfo(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
+   ApiResponse<String> loginUserWithHttpInfo(@QueryMap LoginUserQueryParams queryParams);
 
 
    /**