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

[java] Apply additionalModelTypeAnnotations on enums #7539

Conversation

agilob
Copy link
Contributor

@agilob agilob commented Sep 29, 2020

Fixes #6055

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.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • 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.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)

@agilob
Copy link
Contributor Author

agilob commented Sep 29, 2020

circleci is failing as it finds new changes after generation, but all changes are whitespace

@agilob agilob changed the title Apply additionalModelTypeAnnotations on enums [java] Apply additionalModelTypeAnnotations on enums Oct 3, 2020
@alimac87
Copy link

alimac87 commented Oct 4, 2020

@agilob, just a thought: in enumClass.mustache and enumOuterClass.mustache could you remove the newline between the end of comment "*/"
and "{{>additionalModelTypeAnnotations}}" to avoid the whitespace changes (and blank lines) in generated files?

e.g. in https://github.com/OpenAPITools/openapi-generator/pull/7539/files#diff-758d6dce1a3e4c52e3e30bff17da160f line 3 would read:
*/{{>additionalModelTypeAnnotations}}

@agilob
Copy link
Contributor Author

agilob commented Oct 4, 2020

This time I'm going to take readability of mustache files over extra whitespace in generated code (which you shouldnt modify anyway?)

With your changes it looks even worse :P

image

@alimac87
Copy link

alimac87 commented Oct 4, 2020

Yep fair point - I thought I'd tested this and seen the generated code include a new line between the "*/" and "@", but I must have been mistaken.

Edit: this was the version which did not include the empty lines in output:
{{>additionalModelTypeAnnotations}}public enum

@UnleashSpirit
Copy link
Contributor

UnleashSpirit commented Dec 24, 2020

Is there no potential side effect adding annotation targeted for classes on enums ?
I often use

@lombok.Builder
@lombok.NoArgsConstructor
@lombok.AllArgsConstructor

But on enums, strange no ?
The @lombok.Builder will end iwth "Cannot instantiate the type EnumCategorie"
As it's additionalModelTypeAnnotations I'm not sure this is a good idea

@agilob agilob closed this Jan 7, 2021
@agilob agilob deleted the 6055-additionalModelTypeAnnotations-on-enum branch September 25, 2021 20:34
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] [Spring] [Java] additionalModelTypeAnnotations not applied to enums
3 participants