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

[spring] various bug fixes and enhancements #11580

Merged
merged 8 commits into from
Feb 12, 2022
Merged

[spring] various bug fixes and enhancements #11580

merged 8 commits into from
Feb 12, 2022

Conversation

cachescrubber
Copy link
Contributor

@cachescrubber cachescrubber commented Feb 11, 2022 •
edited
Loading

Collection of older, minimal PRs having merge conflicts

Fixes

PR checklist

  • [ x] Read the contribution guidelines.
  • [ x] 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.
  • [ x] 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.
  • [ x] File the PR against the correct branch: master (5.3.0), 6.0.x
  • [ 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.

cachescrubber and others added 2 commits February 11, 2022 19:06
@cachescrubber
Generate samples
3729e34
@ahrytsiuk @cachescrubber
Fixed mustache template for FormParams. Use paramName instead of base…
9792aad 
…Name for variable name.

This will fix an issue when parameter name is one of the reserved keywords (OpenAPITools#7506)

# Conflicts:
#	modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache
#	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
welshm
welshm approved these changes Feb 11, 2022
View reviewed changes
Copy link
Contributor

@welshm welshm left a comment

Choose a reason for hiding this comment

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

LGTM - minor suggestion

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java Outdated Show resolved Hide resolved
@wing328 wing328 added this to the 6.0.0 milestone Feb 12, 2022
@wing328 wing328 changed the title Feature/spring collect old prs [spring collect old prs Feb 12, 2022
@wing328 wing328 changed the title [spring collect old prs [spring] various bug fixes and enhancements Feb 12, 2022
@wing328 wing328 merged commit 703c963 into OpenAPITools:master Feb 12, 2022
@cachescrubber cachescrubber deleted the feature/spring_collect_old_prs branch February 12, 2022 10:01
This was referenced Mar 18, 2022
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@welshm welshm welshm approved these changes

@jimschubert jimschubert Awaiting requested review from jimschubert

Assignees
No one assigned
Labels
Enhancement: General Issue: Bug Server: Java Server: Spring
Projects
None yet
Milestone
6.0.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cachescrubber @welshm @wing328 @ahrytsiuk