Skip to content

[scala][akka-http] fix non-default packages for api, model and invoker#6129

Merged
wing328 merged 10 commits intoOpenAPITools:masterfrom
chameleon82:bug-scala-akka-main-package
May 2, 2020
Merged

[scala][akka-http] fix non-default packages for api, model and invoker#6129
wing328 merged 10 commits intoOpenAPITools:masterfrom
chameleon82:bug-scala-akka-main-package

Conversation

@chameleon82
Copy link
Copy Markdown
Contributor

@chameleon82 chameleon82 commented May 1, 2020

Default setting for mainPackage is org.openapitools.client and it will be always next values for:
api = mainPackage + .api
invoker = mainPackage + .invoker
model = mainPackage + .model

There is a cases when i want to define all of 3 properties explicitly ( sbt-plugin / gradle-plugin ) or to have custom values.

This fix allows to apply explicitly every property and combine with mainPackage when applicable

#6128

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.

@clasnake (2017/07), @jimschubert (2017/09) ❤️, @shijinkui (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)

@chameleon82 chameleon82 marked this pull request as draft May 2, 2020 06:55
@chameleon82 chameleon82 force-pushed the bug-scala-akka-main-package branch from 58cf744 to c8ca921 Compare May 2, 2020 08:18
@chameleon82 chameleon82 marked this pull request as ready for review May 2, 2020 10:32
Copy link
Copy Markdown
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

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

LGTM

@wing328 wing328 added this to the 4.3.1 milestone May 2, 2020
@wing328 wing328 merged commit 03c3c64 into OpenAPITools:master May 2, 2020
@chameleon82 chameleon82 deleted the bug-scala-akka-main-package branch May 3, 2020 11:16
@wing328
Copy link
Copy Markdown
Member

wing328 commented May 7, 2020

michaelpro1 pushed a commit to michaelpro1/openapi-generator that referenced this pull request May 7, 2020
OpenAPITools#6129)

* [scala][akka-http] fix non-default packages for api, model and invoker

* remove default invoker additionalProperty

* fix invoker package for scala-akka and sttp

* fix invoker package and settings for scala-akka

* fix tests compatible with windows paths

* test output

* test output

* fix base output path for test

* fix output path for test

* fix sttp invoker package
MikailBag pushed a commit to MikailBag/openapi-generator that referenced this pull request May 31, 2020
OpenAPITools#6129)

* [scala][akka-http] fix non-default packages for api, model and invoker

* remove default invoker additionalProperty

* fix invoker package for scala-akka and sttp

* fix invoker package and settings for scala-akka

* fix tests compatible with windows paths

* test output

* test output

* fix base output path for test

* fix output path for test

* fix sttp invoker package
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.

2 participants