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
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
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) {

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);
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);
}