Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Java][RestTemplate] Prevent conflicts with accept(s) local variables #7101

Merged
merged 2 commits into from
Aug 4, 2020
Merged

[Java][RestTemplate] Prevent conflicts with accept(s) local variables #7101

merged 2 commits into from
Aug 4, 2020

Conversation

mikesaurus
Copy link
Contributor

@mikesaurus mikesaurus commented Jul 31, 2020 •
edited
Loading

fix #4222
(see #4222 for simple example and steps to reproduce.)

  • Changed Java/resttemplate/api.mustache local variables from accept(s) to localVarAccept(s) to avoid collisions with API contract accept(s) parameters.
  • Built openapi-generator-maven-plugin and successfully used it to generate client for current development project with an API contract that includes operations with "Accept" header parameters. (Also verified template changes using o-g-m-p v4.3.1 using templateDirectory override.)
  • Ran openapi-generator integration tests against newly generated samples.

PR checklist

  • [ X] Read the contribution guidelines.
  • [ X] If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • [ X] Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. 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.
  • [ X] File the PR against the correct branch: master
  • [ X] Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

CC: Java Technical Committee [@bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608 @bkabrda]

@mikesaurus mikesaurus mentioned this pull request Jul 31, 2020
Closed
wing328
wing328 approved these changes Aug 4, 2020
View reviewed changes
Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Shippable failure not related to this change.

@wing328 wing328 merged commit 34f0d02 into OpenAPITools:master Aug 4, 2020
@wing328 wing328 added this to the 5.0.0 milestone Aug 4, 2020
@wing328 wing328 changed the title ISSUE-4222: Prevent conflicts with accept(s) local variables in generated Java RestTemplate ApiClient [Java][RestTemplate] Prevent conflicts with accept(s) local variables Aug 4, 2020
@mikesaurus mikesaurus deleted the issue-4222 branch August 4, 2020 13:57
jimschubert added a commit that referenced this pull request Aug 12, 2020
@jimschubert
Merge branch 'master' into path-handling
f3db22c 
* master: (129 commits)
  [typescript-axios] add promise to bearer and oauth tokens (#7132)
  update doc
  [REQ] Added enumClassPrefix option to Go server generation (#7008)
  [Java][jersey2] Add helper methods for oneOf Java classes (#7115)
  [Kotlin][Retrofit2] fix missing import for file (#7121)
  adding handling for epoch dates in javascript ApiClient mustache file (#6497) (#6504)
  update doc
  comment out cpanm in travis
  [Kotlin] Rxjava3 support (#6998)
  [BUG][JAVA] Fix error handling in okhttp-gson async api client (#7089)
  Update to reset httpRepsonse.Body (#6948)
  [php-lumen] Set required PHP version to ^7.2.5 (#6949)
  [contrib][docs] Assert importance of title/description/repro steps (#7103)
  ISSUE-4222: Prevent conflicts with accept(s) local variables in generated Java RestTemplate ApiClient (#7101)
  [bug][core] Copy all attributes (not properties) on composed schemas when flattening models (#7106)
  [core] Add type and format properties to model of inline response (#6153)
  [PowerShell] better publishing workflow (#7114)
  [aspnetcore] Typo issues in docs and generated code (#7094)
  fix http signaure auth in build.sbt (#7110)
  fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
  ...
@tejasmehta269 tejasmehta269 mentioned this pull request May 24, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wing328 wing328 wing328 approved these changes

Assignees
No one assigned
Labels
Client: Java Enhancement: General
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.

[BUG][JAVA][RestTemplate] Specified Accept header values generates uncompilable code
2 participants
@mikesaurus @wing328