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

Fix for self-referential imports in typescript-angular client (#6450)

Browse Source
This commit is contained in:
Trond Bolsø
2017-10-02 05:24:08 +02:00
committed by wing328
parent 1f4013e7f1
commit 44bf1d69cb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
View File

@@ -270,19 +270,21 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
for (Object _mo : models) {
Map<String, Object> mo = (Map<String, Object>) _mo;
CodegenModel cm = (CodegenModel) mo.get("model");
mo.put("tsImports", toTsImports(cm.imports));
mo.put("tsImports", toTsImports(cm,cm.imports));
}
return result;
}
private List<Map<String, String>> toTsImports(Set<String> imports) {
private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
List<Map<String, String>> tsImports = new ArrayList<>();
for(String im : imports) {
if(!im.equals(cm.classname)) {
HashMap<String, String> tsImport = new HashMap<>();
tsImport.put("classname", im);
tsImport.put("filename", toModelFilename(im));
tsImports.add(tsImport);
}
}
return tsImports;
}