Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !10246

Fix unchecked conversion

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/tjzeeman/10245-fix-unchecked-conversion into master 3 years ago
  • Overview 0
  • Commits 2
  • Pipelines 0
  • Changes 6

Created by: tjzeeman

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

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.
Compare
  • master (base)

and
  • latest version
    3b1d1099
    2 commits, 2 years ago

6 files
+ 6
- 6

    Preferences

    File browser
    Compare changes
modules/…/…/…‎/…/…/libraries‎
restte‎mplate‎
ApiClient‎.mustache‎ +1 -1
webc‎lient‎
ApiClient‎.mustache‎ +1 -1
samples/client‎/petstore/java‎
resttemplate-withXm‎l/src/…/…/…/…/client‎
ApiClie‎nt.java‎ +1 -1
resttemplate/sr‎c/…/…/…/…/client‎
ApiClie‎nt.java‎ +1 -1
webclient-nulable-‎arrays/…/…/…/…/…/…‎
ApiClie‎nt.java‎ +1 -1
webclient/src/…/…/…‎/openapitools/client‎
ApiClie‎nt.java‎ +1 -1
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
+ 1
- 1
  • View file @ 3b1d1099

  • Edit in single-file editor

  • Open in Web IDE


@@ -671,7 +671,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
@@ -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;
modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
+ 1
- 1
  • View file @ 3b1d1099

  • Edit in single-file editor

  • Open in Web IDE


@@ -654,7 +654,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
@@ -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()) {
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+ 1
- 1
  • View file @ 3b1d1099

  • Edit in single-file editor

  • Open in Web IDE


@@ -622,7 +622,7 @@ public class ApiClient extends JavaTimeFormatter {
@@ -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;
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
+ 1
- 1
  • View file @ 3b1d1099

  • Edit in single-file editor

  • Open in Web IDE


@@ -627,7 +627,7 @@ public class ApiClient extends JavaTimeFormatter {
@@ -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;
samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
+ 1
- 1
  • View file @ 3b1d1099

  • Edit in single-file editor

  • Open in Web IDE


@@ -641,7 +641,7 @@ public class ApiClient extends JavaTimeFormatter {
@@ -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()) {
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
4
Breaking change (without fallback) Client: R Enhancement: Code Cleanup Enhancement: Code format
4
Breaking change (without fallback) Client: R Enhancement: Code Cleanup Enhancement: Code format
    Assign labels
  • Manage project labels

Milestone
6.0.0
6.0.0 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference: OpenAPITools/openapi-generator!12387
Source branch: github/fork/tjzeeman/10245-fix-unchecked-conversion

Menu

Explore Projects Groups Snippets