Merge branch 'master' into master

swagger-api · Jun 24, 2020 · 1b84ca1 · 1b84ca1
2 parents 9595adc + 9e737b4
commit 1b84ca1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -993,6 +993,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Zalando](https://tech.zalando.com)
 - [ZEEF.com](https://zeef.com/)
 - [zooplus](https://www.zooplus.com/)
+- [Trifork](https://www.trifork.com/)
 
 Presentations/Videos/Tutorials/Books
 ----------------------------------------

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
@@ -1477,7 +1477,7 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
 
  if(parentName != null) {
  m.parentSchema = parentName;
- m.parent = toModelName(parentName);
+ m.parent = typeMapping.containsKey(parentName) ? typeMapping.get(parentName): toModelName(parentName);
  addImport(m, m.parent);
  if (allDefinitions != null) {
  final Model parentModel = allDefinitions.get(m.parentSchema);