fixes(java/restclient) Force usage of custom converter (#20112)

* fixes(java/restclient) Force usage of custom converter Insert custom converter at the beginning of the 'RestClientBuilder' converter list so as not to use default 'MappingJackson2HttpMessageConverter' Close #20111 * update samples --------- Co-authored-by: William Cheng <[email protected]>
OpenAPITools · Nov 19, 2024 · 18b01ca · 18b01ca
1 parent 654f62c
commit 18b01ca
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
@@ -156,9 +156,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
         {{/withXml}}
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
             {{#withXml}}
-            converters.add(new MappingJackson2XmlHttpMessageConverter(xmlMapper));
+            converters.add(0, new MappingJackson2XmlHttpMessageConverter(xmlMapper));
             {{/withXml}}
         };
 
@@ -750,4 +750,4 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -141,7 +141,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -716,4 +716,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/...va/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/...va/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
@@ -139,7 +139,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -714,4 +714,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/...tore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/...tore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
@@ -139,7 +139,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -714,4 +714,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/...nt/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/...nt/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -145,7 +145,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/...restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java b/...restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
@@ -145,7 +145,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -145,7 +145,7 @@ protected void init() {
     */
     public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
         Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
-            converters.add(new MappingJackson2HttpMessageConverter(mapper));
+            converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
         };
 
         return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
         return collectionFormat.collectionToString(values);
     }
-}
+}