From ba9bd11a8d05479a3f14d58229e146cca55ef5d9 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 5 Jan 2016 14:58:36 -0800 Subject: [PATCH] updated parentModel names in inheritence situations --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 4 ++-- .../io/swagger/codegen/languages/JavaClientCodegen.java | 2 +- .../java/io/swagger/codegen/java/JavaModelEnumTest.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index b9b2bf38722..2507bf90333 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -788,9 +788,9 @@ public class DefaultCodegen { // 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) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 90a5dcfd210..86eb9ee62a7 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -456,7 +456,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { 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); } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java index 33470e9bb50..68f4168a7dd 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java @@ -73,14 +73,14 @@ public class JavaModelEnumTest { final DefaultCodegen codegen = new JavaClientCodegen(); final Map allModels = new HashMap(); - 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