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.

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

[kotlin-server][jaxrs-spec] Use templated value javaxPackage in mustache templates for kotlin-server generator #15618

Closed
wants to merge 1 commit into from

Conversation

gdiegel
Copy link

@gdiegel gdiegel commented May 23, 2023

Fixes #15617

This PR switches the hardcoded javax in the import statements with the templated value {{javaxPackage}} in order to have it correctly replaced with the desired package based on the config option useJakartaEe. It includes addes unit tests and test resources.

@jimschubert, @dr4ke616, @karismann, @Zomzog, @andrewemery, @4brunu, @yutaka0m

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.
  • In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date
    
    Commit all changed files.
  • File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

Switch the hardcoded javax in the import statements with the templated
value `{{javaxPackage}}` in order to have it correctly replaced with the
desired package based on the config option `useJakartaEe`. Add tests and
test resources.
@gdiegel gdiegel changed the title Use templated value javaxPackage in mustache templates for kotlin-server generator [kotlin-server] Use templated value javaxPackage in mustache templates for kotlin-server generator May 23, 2023
@gdiegel gdiegel changed the title [kotlin-server] Use templated value javaxPackage in mustache templates for kotlin-server generator [kotlin-server][jaxrs-spec] Use templated value javaxPackage in mustache templates for kotlin-server generator May 23, 2023
@4brunu
Copy link
Contributor

4brunu commented May 24, 2023

Hi @gdiegel, thanks for creating this PR.
Can you please check if #15593 already fixes this?
Thanks

@gdiegel
Copy link
Author

gdiegel commented May 24, 2023

Hi @4brunu, it does, seeing that it contains the same fixes I made and also, importantly, amends the documentation and cli options. This PR #15618 may be closed.

@gdiegel
Copy link
Author

gdiegel commented May 24, 2023

Is there going to be a 6.7.0 release before the 7.0.0 release? If yes, when can we expect it to be released?

@wing328
Copy link
Member

wing328 commented May 29, 2023

Is there going to be a 6.7.0 release before the 7.0.0 release? If yes, when can we expect it to be released?

Nope

I hope to release v7.0.0 by the end of Jun

@wing328 wing328 closed this May 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG][kotlin-server][jaxrs-spec] Model classes don't use jakarta package when useJakartaEe is true
3 participants