Skip to content

Restore allOf behaviour (model composition) for definition with a single schema reference #5977

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.

Sign up for GitHub

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
wing328 merged 4 commits into from
Apr 20, 2020
Merged

Restore allOf behaviour (model composition) for definition with a single schema reference #5977

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c23b1b
Fixes getParentName function
spacether Apr 17, 2020
9066028
Updates getChildrenMap to not throw a NPE
spacether Apr 19, 2020
3d3e682
Updates test
spacether Apr 19, 2020
161e759
Runs ensure up to date
spacether Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates test
  • Loading branch information
@spacether
spacether committed Apr 19, 2020
commit 3d3e682afaf6ab73dc2ca12d11df5e3efad8ed3b
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ public void testAllOfSingleRefWithOwnPropsNoDiscriminator() {
Schema schema = openAPI.getComponents().getSchemas().get("MessageEventCoreWithTimeListEntries");
codegen.setOpenAPI(openAPI);
CodegenModel model = codegen.fromModel("MessageEventCoreWithTimeListEntries", schema);
Assert.assertEquals(model.parent, "MessageEventCore");
Assert.assertEquals(model.allParents, Collections.singletonList("MessageEventCore"));
Assert.assertEquals(model.parent, null);
Assert.assertEquals(model.allParents, null);
}

@Test
Expand Down