loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

updated parentModel names in inheritence situations

Browse Source
This commit is contained in:
Tony Tam 2016-01-05 14:58:36 -08:00
parent e83cea0a48
commit ba9bd11a8d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -788,9 +788,9 @@ public class DefaultCodegen {
// parent model // parent model
final RefModel parent = (RefModel) composed.getParent(); final RefModel parent = (RefModel) composed.getParent();
if (parent != null) { if (parent != null) {
final String parentRef = toModelName(parent.getSimpleRef()); final String parentRef = parent.getSimpleRef();
m.parent = parentRef; m.parent = parentRef;
addImport(m, parentRef); addImport(m, toModelName(parent.getSimpleRef()));
if (!supportsInheritance && allDefinitions != null) { if (!supportsInheritance && allDefinitions != null) {
final Model parentModel = allDefinitions.get(parentRef); final Model parentModel = allDefinitions.get(parentRef);
if (parentModel instanceof ModelImpl) { if (parentModel instanceof ModelImpl) {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View File

@ -456,7 +456,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
CodegenModel codegenModel = super.fromModel(name, model, allDefinitions); CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) { 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); final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel); codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
} }

6
modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java
View File

@ -73,14 +73,14 @@ public class JavaModelEnumTest {
final DefaultCodegen codegen = new JavaClientCodegen(); final DefaultCodegen codegen = new JavaClientCodegen();
final Map<String, Model> allModels = new HashMap<String, Model>(); final Map<String, Model> allModels = new HashMap<String, Model>();
allModels.put(codegen.toModelName(parentModel.getName()), parentModel); allModels.put(parentModel.getName(), parentModel);
allModels.put(codegen.toModelName(subModel.getName()), subModel); allModels.put(subModel.getName(), subModel);
final CodegenModel cm = codegen.fromModel("sample", model, allModels); final CodegenModel cm = codegen.fromModel("sample", model, allModels);
Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample"); Assert.assertEquals(cm.classname, "Sample");
Assert.assertEquals(cm.parent, "ParentModel"); Assert.assertEquals(cm.parent, "parentModel");
Assert.assertTrue(cm.imports.contains("ParentModel")); Assert.assertTrue(cm.imports.contains("ParentModel"));
// Assert that only the unshared/uninherited enum remains // Assert that only the unshared/uninherited enum remains