Merge pull request #9768 from swagger-api/ticket-7866

frantuma · web-flow · commit 0aa281568741 · 2019-10-11T12:43:02.000+02:00
refs #7866 - revert #9700
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
@@ -390,7 +390,7 @@ private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> impor
             if (!im.equals(cm.classname)) {
                 HashMap<String, String> tsImport = new HashMap<>();
                 tsImport.put("classname", im);
-                tsImport.put("filename", im);
+                tsImport.put("filename", toModelFilename(im));
                 tsImports.add(tsImport);
             }
         }
@@ -425,7 +425,7 @@ public String toModelFilename(String name) {
 
     @Override
     public String toModelImport(String name) {
-        return modelPackage() + "/" + name;
+        return modelPackage() + "/" + toModelFilename(name);
     }
 
     public String getNpmName() {

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> impor`
`390`	`390`	`if (!im.equals(cm.classname)) {`
`391`	`391`	`HashMap<String, String> tsImport = new HashMap<>();`
`392`	`392`	`tsImport.put("classname", im);`
`393`		`- tsImport.put("filename", im);`
	`393`	`+ tsImport.put("filename", toModelFilename(im));`
`394`	`394`	`tsImports.add(tsImport);`
`395`	`395`	`}`
`396`	`396`	`}`
`@@ -425,7 +425,7 @@ public String toModelFilename(String name) {`
`425`	`425`
`426`	`426`	`@Override`
`427`	`427`	`public String toModelImport(String name) {`
`428`		`- return modelPackage() + "/" + name;`
	`428`	`+ return modelPackage() + "/" + toModelFilename(name);`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`public String getNpmName() {`