Skip to content

Conversation

@ePaul
Copy link
Contributor

@ePaul ePaul commented Feb 28, 2017

This hopefully fixes #1219 and #4870 (and possibly other issues).

PR checklist

  • Read the contribution guildelines.
  • Ran the shell script ./bin/spring-all-petstore.sh to update Petstore sample so that CIs can verify the change.
  • [?] Filed the PR against the correct branch: master for non-breaking changes and 2.3.0 branch for breaking (non-backward compatible) changes.
    • While this changes the behavior of the generated code, this code didn't work before, and now works. I think it doesn't break anything which was working correctly.

Description of the PR

This includes the changes of #4874 – view just the last commit in the diff, or merge that PR before this one to see the effects of the actual changes on the samples here.

As proposed by @wing328 in #4870, I tried to use {{baseName}} instead of {{paramName}} for the values of some generated Spring annotations. I used this for all parameter types: path parameters, form parameters and query parameters. Header parameters were already correct.

This is done so I can see my own changes better.
@ePaul
Copy link
Contributor Author

ePaul commented Mar 2, 2017

Rebased onto master to trigger CI again.

@wing328 wing328 merged commit 88c9b60 into swagger-api:master Mar 3, 2017
@wing328 wing328 changed the title Fix for #1219 [Java][Spring] use {{baseName}} instead of {{paramName}} for Spring annotations Mar 3, 2017
@ePaul ePaul deleted the issue-1219 branch March 3, 2017 17:31
ePaul pushed a commit to ePaul/swagger-codegen that referenced this pull request Mar 4, 2017
ePaul pushed a commit to ePaul/swagger-codegen that referenced this pull request Mar 5, 2017
wing328 pushed a commit that referenced this pull request Mar 6, 2017
Somehow I omitted this in #4875.
spr3nk3ls pushed a commit to spr3nk3ls/swagger-codegen that referenced this pull request Mar 28, 2017
* Update spring samples with current code.

This is done so I can see my own changes better.

* Regenerate samples after 2.2.2.

* use baseName instead of paramName for spring annotations.

* update spring petstore samples to show the effects.
spr3nk3ls pushed a commit to spr3nk3ls/swagger-codegen that referenced this pull request Mar 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

springmvc: parameter names don't survive generation

2 participants