loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 22:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unchecked conversion (#10246)

Browse Source 
* Fix unchecked conversion

Update restttemplate and webclient templates to use <>-operator.
Also update samples.

* Update samples
This commit is contained in:
Thomas Zeeman 2021-08-25 04:09:53 +02:00 committed by GitHub
parent cab2244646
commit f2b50faeec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -671,7 +671,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException { public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
Map<String,Object> uriParams = new HashMap(); Map<String,Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
String finalUri = path; String finalUri = path;

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

@ -654,7 +654,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
String finalUri = builder.build(false).toUriString(); String finalUri = builder.build(false).toUriString();
Map<String, Object> uriParams = new HashMap(); Map<String, Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
if (queryParams != null && !queryParams.isEmpty()) { if (queryParams != null && !queryParams.isEmpty()) {

2
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -627,7 +627,7 @@ public class ApiClient extends JavaTimeFormatter {
public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException { public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
Map<String,Object> uriParams = new HashMap(); Map<String,Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
String finalUri = path; String finalUri = path;

2
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -622,7 +622,7 @@ public class ApiClient extends JavaTimeFormatter {
public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException { public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
Map<String,Object> uriParams = new HashMap(); Map<String,Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
String finalUri = path; String finalUri = path;

2
samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -620,7 +620,7 @@ public class ApiClient extends JavaTimeFormatter {
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
String finalUri = builder.build(false).toUriString(); String finalUri = builder.build(false).toUriString();
Map<String, Object> uriParams = new HashMap(); Map<String, Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
if (queryParams != null && !queryParams.isEmpty()) { if (queryParams != null && !queryParams.isEmpty()) {

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

@ -641,7 +641,7 @@ public class ApiClient extends JavaTimeFormatter {
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
String finalUri = builder.build(false).toUriString(); String finalUri = builder.build(false).toUriString();
Map<String, Object> uriParams = new HashMap(); Map<String, Object> uriParams = new HashMap<>();
uriParams.putAll(pathParams); uriParams.putAll(pathParams);
if (queryParams != null && !queryParams.isEmpty()) { if (queryParams != null && !queryParams.isEmpty()) {