From 47206fceca377c5bb04d216a37b4debdcb91c5db Mon Sep 17 00:00:00 2001 From: Benjamin Einaudi Date: Fri, 15 Nov 2024 15:55:48 +0100 Subject: [PATCH 1/2] 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 --- .../resources/Java/libraries/restclient/ApiClient.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index 43d97e14f196..99ea8a861278 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache @@ -156,9 +156,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { {{/withXml}} Consumer>> 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); } -} \ No newline at end of file +} From 255b169be7a0dd47acd38e73e095ad9cc9cb2b86 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 19 Nov 2024 15:59:19 +0800 Subject: [PATCH 2/2] update samples --- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 index 9b62456ecfc7..d7ab3753c7e4 100644 --- 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>> 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); } -} \ No newline at end of file +} diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java index 36f2c4dba782..b9370967c7b5 100644 --- a/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/others/java/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>> 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); } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java index eaa60f0ced3c..3091596d35c8 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/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>> 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); } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java index 94c8d69da13c..0b172e06684b 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/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>> 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); } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java index 94c8d69da13c..0b172e06684b 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/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>> 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); } -} \ No newline at end of file +} 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 index 94c8d69da13c..0b172e06684b 100644 --- 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>> 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); } -} \ No newline at end of file +}