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

Scala Cask oneOf support #20051

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Conversation

aaronp
Copy link
Contributor

@aaronp aaronp commented Nov 7, 2024

Scala Cask: This PR adds support for using union-types for oneOf requests.

It also updates some scala libraries in the SBT build and addresses a potential name conflict in the generated
code ('errors' has been renamed).

Local regressions tests have been added to cover these cases which are not part of this PR

PR checklist

  • [x ] Read the contribution guidelines.
  • [ x] 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.
  • [ x] Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    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*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.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.

@aaronp aaronp force-pushed the cask-oneOf-support branch from 1cb59a8 to 433a809 Compare November 7, 2024 16:07
also updated libs and an 'errors' field rename to address
name clashes with likely/popular field names
@aaronp aaronp force-pushed the cask-oneOf-support branch from 433a809 to 2a7944e Compare November 7, 2024 17:06
@aaronp
Copy link
Contributor Author

aaronp commented Nov 7, 2024

As ever, thanks again @wing328 in advance for your time on these PRs. In this case, I look to be getting a spurious Typescript failure ... not sure how to address that?

@wing328
Copy link
Member

wing328 commented Nov 8, 2024

@aaronp
Copy link
Contributor Author

aaronp commented Nov 8, 2024

https://github.com/OpenAPITools/openapi-generator/actions/runs/11727815511/job/32669799075?pr=20051

please ignore that for the time being

Ok - thanks. Are merges paused until that's resolved, or can we merge into a broken build for other generators?

@wing328
Copy link
Member

wing328 commented Nov 9, 2024

thanks for the PR

please update https://github.com/OpenAPITools/openapi-generator/blob/master/bin/configs/scala-cask-petstore.yaml

with a new modules/openapi-generator/src/test/resources/3_0/scala-cask/petstore.yaml (copied of petstore.yaml) and add some schemas to test oneOf

Includes a oneOf and allOf example
@aaronp
Copy link
Contributor Author

aaronp commented Nov 11, 2024

thanks for the PR

please update https://github.com/OpenAPITools/openapi-generator/blob/master/bin/configs/scala-cask-petstore.yaml

with a new modules/openapi-generator/src/test/resources/3_0/scala-cask/petstore.yaml (copied of petstore.yaml) and add some schemas to test oneOf

Excellent shout! Many thanks ... done 👍

@wing328
Copy link
Member

wing328 commented Nov 11, 2024

nice. let's give it a try

@wing328 wing328 merged commit 6792218 into OpenAPITools:master Nov 11, 2024
27 of 28 checks passed
@wing328
Copy link
Member

wing328 commented Nov 11, 2024

CI failure fixed via 85f7112

@aaronp
Copy link
Contributor Author

aaronp commented Nov 11, 2024 via email

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