Skip to content

Commit 18b01ca

Browse files
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]>
1 parent 654f62c commit 18b01ca

File tree

7 files changed

+15
-15
lines changed
  • modules/openapi-generator/src/main/resources/Java/libraries/restclient
  • samples/client
    • echo_api/java/restclient/src/main/java/org/openapitools/client
    • others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client
    • petstore/java
      • restclient/src/main/java/org/openapitools/client
      • restclient-nullable-arrays/src/main/java/org/openapitools/client
      • restclient-swagger2/src/main/java/org/openapitools/client
      • restclient-useSingleRequestParameter/src/main/java/org/openapitools/client

7 files changed

+15
-15
lines changed

modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
156156

157157
{{/withXml}}
158158
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
159-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
159+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
160160
{{#withXml}}
161-
converters.add(new MappingJackson2XmlHttpMessageConverter(xmlMapper));
161+
converters.add(0, new MappingJackson2XmlHttpMessageConverter(xmlMapper));
162162
{{/withXml}}
163163
};
164164

@@ -750,4 +750,4 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
750750
751751
return collectionFormat.collectionToString(values);
752752
}
753-
}
753+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected void init() {
141141
*/
142142
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
143143
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
144-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
144+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
145145
};
146146

147147
return RestClient.builder().messageConverters(messageConverters);
@@ -716,4 +716,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
716716

717717
return collectionFormat.collectionToString(values);
718718
}
719-
}
719+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected void init() {
139139
*/
140140
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
141141
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
142-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
142+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
143143
};
144144

145145
return RestClient.builder().messageConverters(messageConverters);
@@ -714,4 +714,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
714714

715715
return collectionFormat.collectionToString(values);
716716
}
717-
}
717+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected void init() {
139139
*/
140140
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
141141
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
142-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
142+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
143143
};
144144

145145
return RestClient.builder().messageConverters(messageConverters);
@@ -714,4 +714,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
714714

715715
return collectionFormat.collectionToString(values);
716716
}
717-
}
717+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected void init() {
145145
*/
146146
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
147147
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
148-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
148+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
149149
};
150150

151151
return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
734734

735735
return collectionFormat.collectionToString(values);
736736
}
737-
}
737+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected void init() {
145145
*/
146146
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
147147
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
148-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
148+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
149149
};
150150

151151
return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
734734

735735
return collectionFormat.collectionToString(values);
736736
}
737-
}
737+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected void init() {
145145
*/
146146
public static RestClient.Builder buildRestClientBuilder(ObjectMapper mapper) {
147147
Consumer<List<HttpMessageConverter<?>>> messageConverters = converters -> {
148-
converters.add(new MappingJackson2HttpMessageConverter(mapper));
148+
converters.add(0, new MappingJackson2HttpMessageConverter(mapper));
149149
};
150150

151151
return RestClient.builder().messageConverters(messageConverters);
@@ -734,4 +734,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
734734

735735
return collectionFormat.collectionToString(values);
736736
}
737-
}
737+
}

0 commit comments

Comments
 (0)