-
Notifications
You must be signed in to change notification settings - Fork 166
Support allOf schemas referring to oneOf schemas #318
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
363489d
Add failing test
julienrf e45c539
Fix #317
julienrf b3f1331
Address reviewer’s feedback
julienrf 0fb2f9c
Check that discriminator is not null before de-referencing it
julienrf f90013c
Prevent resolvedComposedSchema from looping indefinitely by keeping t…
julienrf 662fa62
fixup! Check that discriminator is not null before de-referencing it
julienrf 00dea62
Restore initial solution
julienrf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
core/src/test/java/org/openapitools/openapidiff/core/AllOfOneOfDiffTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.openapitools.openapidiff.core; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.openapitools.openapidiff.core.model.ChangedOpenApi; | ||
|
|
||
| public class AllOfOneOfDiffTest { | ||
| @Test | ||
| void allOfReferringToOneOfSchemasAreSupported() { | ||
| ChangedOpenApi diff = OpenApiCompare.fromLocations("issue-317_1.json", "issue-317_2.json"); | ||
| assertThat(diff.isCoreChanged().isUnchanged()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| { | ||
| "openapi":"3.0.0", | ||
| "info":{ | ||
| "title":"API", | ||
| "version":"0.1.0" | ||
| }, | ||
| "paths":{ | ||
| "/resource":{ | ||
| "post":{ | ||
| "responses":{ | ||
| "200":{ | ||
| "description":"Created resource", | ||
| "content":{ | ||
| "application/json":{ | ||
| "schema":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "summary":"Create resource", | ||
| "requestBody":{ | ||
| "content":{ | ||
| "application/json":{ | ||
| "schema":{ | ||
| "$ref":"#/components/schemas/Resource" | ||
| } | ||
| } | ||
| }, | ||
| "description":"Definition of the resource" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "components":{ | ||
| "schemas":{ | ||
| "Resource":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "assignment":{ | ||
| "$ref":"#/components/schemas/Foo" | ||
| } | ||
| } | ||
| }, | ||
| "Foo":{ | ||
| "oneOf":[ | ||
| { | ||
| "$ref":"#/components/schemas/Foo.Bar" | ||
| }, | ||
| { | ||
| "$ref":"#/components/schemas/Foo.Baz" | ||
| } | ||
| ], | ||
| "discriminator":{ | ||
| "propertyName":"type", | ||
| "mapping":{ | ||
| "Bar":"#/components/schemas/Foo.Bar", | ||
| "Baz":"#/components/schemas/Foo.Baz" | ||
| } | ||
| } | ||
| }, | ||
| "Foo.Bar":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "type":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| }, | ||
| "Foo.Baz":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "type":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "securitySchemes":{ | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "openapi":"3.0.0", | ||
| "info":{ | ||
| "title":"API", | ||
| "version":"0.1.0" | ||
| }, | ||
| "paths":{ | ||
| "/resource":{ | ||
| "post":{ | ||
| "responses":{ | ||
| "200":{ | ||
| "description":"Created resource", | ||
| "content":{ | ||
| "application/json":{ | ||
| "schema":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "summary":"Create resource", | ||
| "requestBody":{ | ||
| "content":{ | ||
| "application/json":{ | ||
| "schema":{ | ||
| "$ref":"#/components/schemas/Resource" | ||
| } | ||
| } | ||
| }, | ||
| "description":"Definition of the resource" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "components":{ | ||
| "schemas":{ | ||
| "Resource":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "assignment":{ | ||
| "default":{ | ||
| "type":"Bar" | ||
| }, | ||
| "allOf":[ | ||
| { | ||
| "$ref":"#/components/schemas/Foo" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "Foo":{ | ||
| "oneOf":[ | ||
| { | ||
| "$ref":"#/components/schemas/Foo.Bar" | ||
| }, | ||
| { | ||
| "$ref":"#/components/schemas/Foo.Baz" | ||
| } | ||
| ], | ||
| "discriminator":{ | ||
| "propertyName":"type", | ||
| "mapping":{ | ||
| "Bar":"#/components/schemas/Foo.Bar", | ||
| "Baz":"#/components/schemas/Foo.Baz" | ||
| } | ||
| } | ||
| }, | ||
| "Foo.Bar":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "type":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| }, | ||
| "Foo.Baz":{ | ||
| "type":"object", | ||
| "properties":{ | ||
| "type":{ | ||
| "type":"string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "securitySchemes":{ | ||
|
|
||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.