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

[kotlin][spring] Fix ApiUtil compilation #6084

Merged
merged 2 commits into from
Jun 5, 2020
Merged

[kotlin][spring] Fix ApiUtil compilation #6084

merged 2 commits into from
Jun 5, 2020

Conversation

sylvainmoindron
Copy link
Contributor

@sylvainmoindron sylvainmoindron commented Apr 28, 2020 •
edited by jimschubert
Loading

fixes #5476 The kotlin-spring generator ApiUtil object doesn't compile, by adding null safe accessor

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@sylvainmoindron
Copy link
Contributor Author

adding technical committe @jimschubert , @dr4ke616 @karismann @Zomzog @andrewemery @4brunu @yutaka0m

@sylvainmoindron sylvainmoindron mentioned this pull request Apr 28, 2020
Closed
@sylvainmoindron sylvainmoindron changed the title 5476 api util object doesnt compile fixed issue #5476 [kotlin] [spring] api util object doesn't compile Apr 28, 2020
yutaka0m
yutaka0m reviewed Apr 28, 2020
View reviewed changes
modules/openapi-generator/src/main/resources/kotlin-spring/apiUtil.mustache
@@ -12,9 +12,9 @@ object ApiUtil {
fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) {
try {
val res = req.getNativeResponse(HttpServletResponse::class.java)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
val res = req.getNativeResponse(HttpServletResponse::class.java)
val res: HttpServletResponse? = req.getNativeResponse(HttpServletResponse::class.java)

Copy link
Contributor Author

@sylvainmoindron sylvainmoindron Apr 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

If res is nullable, how about declare HttpServletResponse? ?

kotlin infer itself that res is of type HttpServletResponse? that's why res.setCharacterEncoding doesn't compile in the original bug.
(in the spring librairie getNativeResponse is annotated by @Nullable)

yutaka0m
yutaka0m reviewed Apr 28, 2020
View reviewed changes
Copy link
Contributor

@yutaka0m yutaka0m left a comment

Choose a reason for hiding this comment

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

If res is nullable, how about declare HttpServletResponse? ?

yutaka0m
yutaka0m approved these changes May 3, 2020
View reviewed changes
Copy link
Contributor

@yutaka0m yutaka0m left a comment

Choose a reason for hiding this comment

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

I can understand.
LGTM 👍

@jimschubert jimschubert self-assigned this May 22, 2020
jimschubert
jimschubert approved these changes Jun 5, 2020
View reviewed changes
Copy link
Member

@jimschubert jimschubert left a comment

Choose a reason for hiding this comment

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

Looks good. Sorry for the delay in review (been very busy).

I'll rebuild samples locally, and if there are changes I'll push them up before merge.

@jimschubert jimschubert changed the title fixed issue #5476 [kotlin] [spring] api util object doesn't compile [kotlin][spring] Fix ApiUtil compilation Jun 5, 2020
@jimschubert jimschubert merged commit 388218b into OpenAPITools:master Jun 5, 2020
jimschubert added a commit that referenced this pull request Jun 5, 2020
@jimschubert
Merge branch 'master' into bugfix/4999
92b403d 
* master: (345 commits)
  [kotlin][spring] Fix ApiUtil compilation (#6084)
  update python samples
  [Python] Fixed docstrings in api.mustache (#6391)
  [BUG][python] Support named arrays (#6493)
  [Go] whitelist AdditionalProperties in the field name (#6543)
  [kotlin][client] remove tabs usage (#6526)
  [PS] automatically derive discriminator mapping for oneOf/anyOf  (#6542)
  [C++][Ue4] various bus fixes (#6539)
  Fix incorrect npx command (#6537)
  update pester to 5.x (#6536)
  comment out openapi3 java jersey2-java8 tests
  add additional properties support to powershell client generator (#6528)
  [Go][Experimental] Support additionalProperties (#6525)
  #5476 [kotlin] [spring] fix swagger and spring annotation for defaultValue (#6101)
  [samples] regenerate (#6533)
  [python] Fix date-time parsing (#6458)
  Register OAuth2ClientContext as bean (#6172)
  [Go][Experimental] Fix discriminator lookup (#6521)
  Typescript-rxjs: print param name (#6368)
  add oneof discrimistrator lookup to go experimental (#6517)
  ...
@sylvainmoindron sylvainmoindron deleted the 5476-ApiUtil-object-doesnt-compile branch June 5, 2020 05:41
jimschubert added a commit that referenced this pull request Jun 6, 2020
@jimschubert
Merge branch 'master' into ensures
9ddc45c 
* master:
  Fix typescript generator for parameter collectionFormat for pipes ssv (#6553)
  [C++][Pistache] Catch HttpError from user-provided handler (#6520)
  remove scala related profile from the pom (#6554)
  move ruby tests to travis (#6555)
  [Java][jersey2] fix cast error for default value in DateTimeOffset object (#6547)
  [Swift] fix GET request with array parameter (#6549)
  [kotlin][spring] Fix ApiUtil compilation (#6084)
  update python samples
  [Python] Fixed docstrings in api.mustache (#6391)
  [BUG][python] Support named arrays (#6493)
  [Go] whitelist AdditionalProperties in the field name (#6543)
  [kotlin][client] remove tabs usage (#6526)
  [PS] automatically derive discriminator mapping for oneOf/anyOf  (#6542)
  [C++][Ue4] various bus fixes (#6539)
  Fix incorrect npx command (#6537)
  update pester to 5.x (#6536)
  comment out openapi3 java jersey2-java8 tests
  add additional properties support to powershell client generator (#6528)
  [Go][Experimental] Support additionalProperties (#6525)
  #5476 [kotlin] [spring] fix swagger and spring annotation for defaultValue (#6101)
@wing328 wing328 added this to the 5.0.0 milestone Jul 3, 2020
@hohner2008 hohner2008 mentioned this pull request Dec 27, 2023
Open
@59notna 59notna mentioned this pull request Dec 27, 2023
Open
@hohner2008 hohner2008 mentioned this pull request Dec 27, 2023
Open
This was referenced Dec 27, 2023
Open
Open
Open
@hohner2008 hohner2008 mentioned this pull request Dec 27, 2023
Open
This was referenced Dec 28, 2023
Open
Open
This was referenced Dec 29, 2023
Open
Open
@hohner2008 hohner2008 mentioned this pull request Jan 5, 2024
Open
This was referenced Jan 5, 2024
Open
Open
@chncaption chncaption mentioned this pull request Jan 5, 2024
Open
This was referenced Jan 5, 2024
Open
Open
@59notna 59notna mentioned this pull request Jan 6, 2024
Open
@hohner2008 hohner2008 mentioned this pull request Jan 6, 2024
Open
@59notna 59notna mentioned this pull request Jan 6, 2024
Merged
@BitcoinOutput BitcoinOutput mentioned this pull request Jan 6, 2024
Open
@chncaption chncaption mentioned this pull request Jan 8, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yutaka0m yutaka0m yutaka0m approved these changes

@jimschubert jimschubert jimschubert approved these changes

Assignees

@jimschubert jimschubert

Labels
None yet
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.

[BUG] The kotlin-spring generator ApiUtil object doesn't compile
4 participants
@sylvainmoindron @jimschubert @yutaka0m @wing328