diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache
index d41c4114222..cb695b271e1 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache
@@ -1,6 +1,11 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
+{{#useHttpClient}}
+import { HttpClientModule } from '@angular/common/http';
+{{/useHttpClient}}
+{{^useHttpClient}}
 import { HttpModule } from '@angular/http';
+{{/useHttpClient}}
 import { Configuration } from './configuration';
 
 {{#apiInfo}}
@@ -10,7 +15,7 @@ import { {{classname}} } from './{{importPath}}';
 {{/apiInfo}}
 
 @NgModule({
-  imports:      [ CommonModule, HttpModule ],
+  imports:      [ CommonModule, {{#useHttpClient}}HttpClientModule{{/useHttpClient}}{{^useHttpClient}}HttpModule{{/useHttpClient}} ],
   declarations: [],
   exports:      [],
   providers:    [ {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, {{/hasMore}}{{/apis}}{{/apiInfo}} ]
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts b/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
index eac4208f022..ac34396e0b3 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
@@ -19,3 +19,5 @@ export interface ApiResponse {
     type?: string;
     message?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/category.ts b/samples/client/petstore/typescript-angular-v2/default/model/category.ts
index 5040d1db915..767b4948418 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/category.ts
@@ -18,3 +18,5 @@ export interface Category {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/order.ts b/samples/client/petstore/typescript-angular-v2/default/model/order.ts
index 33b60bb6e16..3ac0a1c39c7 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/order.ts
@@ -33,3 +33,5 @@ export namespace Order {
         Delivered: 'delivered' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/pet.ts b/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
index 342ab5f8e75..0e08dee12ae 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/pet.ts
@@ -35,3 +35,5 @@ export namespace Pet {
         Sold: 'sold' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/tag.ts b/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
index c7524000357..73e4d26aa3b 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/tag.ts
@@ -18,3 +18,5 @@ export interface Tag {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/model/user.ts b/samples/client/petstore/typescript-angular-v2/default/model/user.ts
index a0261a6f37d..de9c1d85670 100644
--- a/samples/client/petstore/typescript-angular-v2/default/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/model/user.ts
@@ -27,3 +27,5 @@ export interface User {
      */
     userStatus?: number;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts b/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
index eac4208f022..ac34396e0b3 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
@@ -19,3 +19,5 @@ export interface ApiResponse {
     type?: string;
     message?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/category.ts b/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
index 5040d1db915..767b4948418 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/category.ts
@@ -18,3 +18,5 @@ export interface Category {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
index 33b60bb6e16..3ac0a1c39c7 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts
@@ -33,3 +33,5 @@ export namespace Order {
         Delivered: 'delivered' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
index 342ab5f8e75..0e08dee12ae 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
@@ -35,3 +35,5 @@ export namespace Pet {
         Sold: 'sold' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
index c7524000357..73e4d26aa3b 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
@@ -18,3 +18,5 @@ export interface Tag {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/npm/model/user.ts b/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
index a0261a6f37d..de9c1d85670 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/model/user.ts
@@ -27,3 +27,5 @@ export interface User {
      */
     userStatus?: number;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
index 5040d1db915..767b4948418 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
@@ -18,3 +18,5 @@ export interface Category {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
index 33b60bb6e16..3ac0a1c39c7 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
@@ -33,3 +33,5 @@ export namespace Order {
         Delivered: 'delivered' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
index 342ab5f8e75..0e08dee12ae 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
@@ -35,3 +35,5 @@ export namespace Pet {
         Sold: 'sold' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
index c7524000357..73e4d26aa3b 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
@@ -18,3 +18,5 @@ export interface Tag {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
index a0261a6f37d..de9c1d85670 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
@@ -27,3 +27,5 @@ export interface User {
      */
     userStatus?: number;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
index eac4208f022..ac34396e0b3 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
@@ -19,3 +19,5 @@ export interface ApiResponse {
     type?: string;
     message?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api.module.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api.module.ts
index dcce0dbd628..71f51c70cf9 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api.module.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api.module.ts
@@ -1,6 +1,6 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 import { Configuration } from './configuration';
 
 import { PetService } from './api/pet.service';
@@ -8,7 +8,7 @@ import { StoreService } from './api/store.service';
 import { UserService } from './api/user.service';
 
 @NgModule({
-  imports:      [ CommonModule, HttpModule ],
+  imports:      [ CommonModule, HttpClientModule ],
   declarations: [],
   exports:      [],
   providers:    [ PetService, StoreService, UserService ]
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
index eac4208f022..ac34396e0b3 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
@@ -19,3 +19,5 @@ export interface ApiResponse {
     type?: string;
     message?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/category.ts b/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
index 5040d1db915..767b4948418 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/category.ts
@@ -18,3 +18,5 @@ export interface Category {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
index 33b60bb6e16..3ac0a1c39c7 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts
@@ -33,3 +33,5 @@ export namespace Order {
         Delivered: 'delivered' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
index 342ab5f8e75..0e08dee12ae 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
@@ -35,3 +35,5 @@ export namespace Pet {
         Sold: 'sold' as StatusEnum
     }
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
index c7524000357..73e4d26aa3b 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
@@ -18,3 +18,5 @@ export interface Tag {
     id?: number;
     name?: string;
 }
+
+
diff --git a/samples/client/petstore/typescript-angular-v4/npm/model/user.ts b/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
index a0261a6f37d..de9c1d85670 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/model/user.ts
@@ -27,3 +27,5 @@ export interface User {
      */
     userStatus?: number;
 }
+
+