Skip to content

updated parentModel names in inheritence situations #1818

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
merged 1 commit into from
Jan 5, 2016
Merged

updated parentModel names in inheritence situations #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,9 +788,9 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
// parent model
final RefModel parent = (RefModel) composed.getParent();
if (parent != null) {
final String parentRef = toModelName(parent.getSimpleRef());
final String parentRef = parent.getSimpleRef();
m.parent = parentRef;
addImport(m, parentRef);
addImport(m, toModelName(parent.getSimpleRef()));
if (!supportsInheritance && allDefinitions != null) {
final Model parentModel = allDefinitions.get(parentRef);
if (parentModel instanceof ModelImpl) {
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);

if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) {
final Model parentModel = allDefinitions.get(toModelName(codegenModel.parent));
final Model parentModel = allDefinitions.get(codegenModel.parent);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
}
Expand Down
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ public void overrideEnumTest() {

final DefaultCodegen codegen = new JavaClientCodegen();
final Map<String, Model> allModels = new HashMap<String, Model>();
allModels.put(codegen.toModelName(parentModel.getName()), parentModel);
allModels.put(codegen.toModelName(subModel.getName()), subModel);
allModels.put(parentModel.getName(), parentModel);
allModels.put(subModel.getName(), subModel);

final CodegenModel cm = codegen.fromModel("sample", model, allModels);

Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
Assert.assertEquals(cm.parent, "ParentModel");
Assert.assertEquals(cm.parent, "parentModel");
Assert.assertTrue(cm.imports.contains("ParentModel"));

// Assert that only the unshared/uninherited enum remains
Expand Down