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

[JAVA][Webclient]fix select body for url encoded media type. (#2686)

Browse Source 
* fix select body for url encoded media type.

* run bin.
This commit is contained in:
Hugo Barrigas 2019-04-19 07:46:28 +01:00 committed by William Cheng
parent c797073858
commit d6306d8fee
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,8 +472,20 @@ public class ApiClient {
* @return Object the selected body * @return Object the selected body
*/ */
protected BodyInserter<?, ? super ClientHttpRequest> selectBody(Object obj, MultiValueMap<String, Object> formParams, MediaType contentType) { protected BodyInserter<?, ? super ClientHttpRequest> selectBody(Object obj, MultiValueMap<String, Object> formParams, MediaType contentType) {
boolean isForm = MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType) || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType); if(MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) {
return isForm ? BodyInserters.fromMultipartData(formParams) : (obj != null ? BodyInserters.fromObject(obj) : null); MultiValueMap<String, String> map = new LinkedMultiValueMap();
formParams
.toSingleValueMap()
.entrySet()
.forEach(es -> map.add(es.getKey(), (String) es.getValue()));
return BodyInserters.fromFormData(map);
} else if(MediaType.MULTIPART_FORM_DATA.equals(contentType)) {
return BodyInserters.fromMultipartData(formParams);
} else {
return obj != null ? BodyInserters.fromObject(obj) : null;
}
} }
/** /**

16
samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -468,8 +468,20 @@ public class ApiClient {
* @return Object the selected body * @return Object the selected body
*/ */
protected BodyInserter<?, ? super ClientHttpRequest> selectBody(Object obj, MultiValueMap<String, Object> formParams, MediaType contentType) { protected BodyInserter<?, ? super ClientHttpRequest> selectBody(Object obj, MultiValueMap<String, Object> formParams, MediaType contentType) {
boolean isForm = MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType) || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType); if(MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) {
return isForm ? BodyInserters.fromMultipartData(formParams) : (obj != null ? BodyInserters.fromObject(obj) : null); MultiValueMap<String, String> map = new LinkedMultiValueMap();
formParams
.toSingleValueMap()
.entrySet()
.forEach(es -> map.add(es.getKey(), (String) es.getValue()));
return BodyInserters.fromFormData(map);
} else if(MediaType.MULTIPART_FORM_DATA.equals(contentType)) {
return BodyInserters.fromMultipartData(formParams);
} else {
return obj != null ? BodyInserters.fromObject(obj) : null;
}
} }
/** /**