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] Fix imports of generated class #7314

Merged
merged 1 commit into from
Sep 9, 2020
Merged

[kotlin] Fix imports of generated class #7314

merged 1 commit into from
Sep 9, 2020

Conversation

michael-wirth
Copy link
Contributor

@michael-wirth michael-wirth commented Aug 30, 2020

To fix #7313

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.

@auto-labeler
Copy link

auto-labeler bot commented Aug 30, 2020

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@wing328
Copy link
Member

wing328 commented Sep 6, 2020

cc @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328 wing328 changed the title [kotlin] Fix imports of generated class (#7313) [kotlin] Fix imports of generated class Sep 6, 2020
boolean imports = !type.startsWith("kotlin.") && !type.startsWith("java.") && !defaultIncludes.contains(type) && !languageSpecificPrimitives.contains(type);
boolean imports = !type.startsWith("kotlin.") && !type.startsWith("java.") &&
!defaultIncludes.contains(type) && !languageSpecificPrimitives.contains(type) &&
!type.contains(".");
Copy link
Member

Choose a reason for hiding this comment

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

Interesting. I was trying to think of a case where this would fall through, but can't really. Seems like any type with a dot in the name can be assumed to be fully qualified.

If people report it as a bug, we can always adjust. In that unlikely event, it may result in a regression since the change isn't covered by a unit test.

@jimschubert jimschubert merged commit 7b6cc20 into OpenAPITools:master Sep 9, 2020
@jimschubert jimschubert added this to the 5.0.0 milestone Sep 9, 2020
jimschubert added a commit to lwlee2608/openapi-generator that referenced this pull request Sep 12, 2020
* master: (1557 commits)
  [docs] Add notes on Windows classpath modification (OpenAPITools#7404)
  [C#][netcore] better support for additional properties in the payload (OpenAPITools#7396)
  Fix the ECDSA signature issue for PowerShellSDK (OpenAPITools#7386)
  Fix the new package that deal with Configuration (the old one is depecrated) (OpenAPITools#7391)
  update vonage logo (OpenAPITools#7387)
  [gradle][plugin] Fix tests (OpenAPITools#7384)
  [typescript] Fix incorrect enum literal case (OpenAPITools#7378)
  Rust reqwest/api_mustache Missing api Vec in parameter (OpenAPITools#7049)
  [kotlin] Fix imports of generated class (OpenAPITools#7314)
  Properly decode $ref (OpenAPITools#7191)
  fix typo, update caption
  feat(r): retry configuration for status codes (OpenAPITools#5925)
  [json][codegen] Add option: outputFileName (OpenAPITools#7348)
  RSACng class is not supported on linux replacing it by RSA (OpenAPITools#7349)
  Adds cookie auth support to ApiKeyAuth in dart2 templates (OpenAPITools#7346)
  [js][flowtype] Bump lodash from 4.17.15 to 4.17.19 (OpenAPITools#7359)
  Bugfix swift5 code generation 2966 (OpenAPITools#7301)
  Syncs validation properties for arraymodels (OpenAPITools#7357)
  Subclass Python exceptions (OpenAPITools#7321)
  Adds fix for issue7262 and a test of it (OpenAPITools#7328)
  ...
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.

[BUG] kotlin-spring generator resolves invalid package for imports form importMap
3 participants