Merge pull request #497 from swagger-api/ticket-7866-v3

refs swagger-api/swagger-codegen#7866 - revert #461

Author: frantuma

src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java

@@ -116,7 +116,7 @@ public void processOpts() {
             LOGGER.info("  (you can select the angular version by setting the additionalProperty ngVersion)");
         }
         additionalProperties.put(NG_VERSION, ngVersion);
-        additionalProperties.put(NG_PACKAGR, ngVersion.atLeast("8.0.0"));
+        additionalProperties.put(NG_PACKAGR, ngVersion.atLeast("4.0.0"));
         additionalProperties.put("useRxJS6", ngVersion.atLeast("6.0.0"));
         additionalProperties.put("injectionToken", ngVersion.atLeast("4.0.0") ? "InjectionToken" : "OpaqueToken");
         additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
@@ -357,7 +357,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);
             }
         }
@@ -392,7 +392,7 @@ public String toModelFilename(String name) {
 
     @Override
     public String toModelImport(String name) {
-        return modelPackage() + "/" + name;
+        return modelPackage() + "/" + toModelFilename(name);
     }
 
     public String getNpmName() {