loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source 
* 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 <wing328hk@gmail.com>
This commit is contained in:
Benjamin Einaudi 2024-11-19 09:15:51 +01:00 committed by GitHub
parent 654f62ce3c
commit 18b01ca455
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache vendored
View File

@ -156,9 +156,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
{{/withXml}} {{/withXml}}
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
{{#withXml}} {{#withXml}}
converters.add(new MappingJackson2XmlHttpMessageConverter(xmlMapper)); converters.add(0, new MappingJackson2XmlHttpMessageConverter(xmlMapper));
{{/withXml}} {{/withXml}}
}; };
@ -750,4 +750,4 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -141,7 +141,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -716,4 +716,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -139,7 +139,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -714,4 +714,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -139,7 +139,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -714,4 +714,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -145,7 +145,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -734,4 +734,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -145,7 +145,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -734,4 +734,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }

4
samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -145,7 +145,7 @@ public class ApiClient extends JavaTimeFormatter {
*/ */
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) { public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> { Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
converters.add(new MappingJackson2HttpMessageConverter(mapper)); converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
}; };
return RestClient.builder().messageConverters(messageConverters); return RestClient.builder().messageConverters(messageConverters);
@ -734,4 +734,4 @@ public class ApiClient extends JavaTimeFormatter {
return collectionFormat.collectionToString(values); return collectionFormat.collectionToString(values);
} }
} }