From f2b50faeec07c2a6394a4a37daa1d431e7a2b0cb Mon Sep 17 00:00:00 2001 From: Thomas Zeeman Date: Wed, 25 Aug 2021 04:09:53 +0200 Subject: [PATCH] Fix unchecked conversion (#10246) * Fix unchecked conversion Update restttemplate and webclient templates to use <>-operator. Also update samples. * Update samples --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 2 +- .../main/resources/Java/libraries/webclient/ApiClient.mustache | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index 33c4d1ec919..7909a65a41d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -671,7 +671,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { public ResponseEntity invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); String finalUri = path; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache index cabd6408abc..2cc373ae78f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache @@ -654,7 +654,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); String finalUri = builder.build(false).toUriString(); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); if (queryParams != null && !queryParams.isEmpty()) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java index 422daa4c213..244cbd852dd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java @@ -627,7 +627,7 @@ public class ApiClient extends JavaTimeFormatter { public ResponseEntity invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); String finalUri = path; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java index 1912fef80a3..37788fa2818 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java @@ -622,7 +622,7 @@ public class ApiClient extends JavaTimeFormatter { public ResponseEntity invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); String finalUri = path; diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java index 8cdcbac35cb..7694b7d9b95 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java @@ -620,7 +620,7 @@ public class ApiClient extends JavaTimeFormatter { final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); String finalUri = builder.build(false).toUriString(); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); if (queryParams != null && !queryParams.isEmpty()) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java index 74e87d2c7b3..3510c9f459b 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java @@ -641,7 +641,7 @@ public class ApiClient extends JavaTimeFormatter { final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path); String finalUri = builder.build(false).toUriString(); - Map uriParams = new HashMap(); + Map uriParams = new HashMap<>(); uriParams.putAll(pathParams); if (queryParams != null && !queryParams.isEmpty()) {