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

Hotfix: Remove oneOf: allow both courses and treatments #159

Merged
merged 1 commit into from
Oct 6, 2020

Conversation

cookeac
Copy link
Collaborator

@cookeac cookeac commented Oct 5, 2020

Hotfix: Simplify icarTreatmentProgramEventResource.json removing "oneOf".
This should fix an OpenAPI 4.x code gen problem that seems to arise from combining "allOf" and "oneOf".

This allows both courses and treatments to be specified in the same object.
I was going to add a discriminator to (e.g. hasTreatments) but thought there may be cases where a combination was valid, and on the basis that it is easier to add an attribute later than remove one, I have left it out.

Proposed for review and inclusion into ADE-1-1 branch for a hotfix (ADE 1.1.1) as it won't break current code but will enable code generation.

Fixes #158

@dickerpulli
Copy link

Thank you for creating this hotfix. When can we expect to have this hotfix version 1.1.1?

@cookeac
Copy link
Collaborator Author

cookeac commented Oct 5, 2020

@dickerpulli - this week I hope

@cookeac cookeac requested a review from ahokkonen October 5, 2020 21:08
@cookeac
Copy link
Collaborator Author

cookeac commented Oct 6, 2020

I'm going to merge this myself so @dickerpulli @thomasd-gea can do some testing of code generation. If this works, we'll bundle into a v1.1.1 release.

@cookeac cookeac merged commit 948f00b into adewg:ADE-1-1 Oct 6, 2020
@dickerpulli
Copy link

Thank you 👍

@dickerpulli
Copy link

dickerpulli commented Oct 6, 2020

I can confirm that the code generation now works (Branch ADE-1-1)

@dickerpulli
Copy link

@cookeac When can we expect to have the new tag v1.1.1?

@cookeac
Copy link
Collaborator Author

cookeac commented Oct 7, 2020

@dickerpulli There now Thomas. :-)

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.

Error when generating code from tag v1.1.0
2 participants