From 44bf1d69cb3ddc483aa533ef01fe790c51bc617d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Bols=C3=B8?= Date: Mon, 2 Oct 2017 05:24:08 +0200 Subject: [PATCH] Fix for self-referential imports in typescript-angular client (#6450) --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java index 3283bdb32397..cab99599846b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java @@ -270,19 +270,21 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode for (Object _mo : models) { Map mo = (Map) _mo; CodegenModel cm = (CodegenModel) mo.get("model"); - mo.put("tsImports", toTsImports(cm.imports)); + mo.put("tsImports", toTsImports(cm,cm.imports)); } return result; } - private List> toTsImports(Set imports) { + private List> toTsImports(CodegenModel cm, Set imports) { List> tsImports = new ArrayList<>(); for(String im : imports) { + if(!im.equals(cm.classname)) { HashMap tsImport = new HashMap<>(); tsImport.put("classname", im); tsImport.put("filename", toModelFilename(im)); tsImports.add(tsImport); + } } return tsImports; }