From 41a134d459d3534da0dde810ef3fd704796db42c Mon Sep 17 00:00:00 2001 From: Johannes Hoppe Date: Wed, 18 Oct 2017 11:17:23 +0200 Subject: [PATCH 1/4] [angular-typescript] imports HttpClientModule HttpModule has no effect, since the new `HttpClient` is now used. fixes #6727 --- .../src/main/resources/typescript-angular/api.module.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..1d5362988b7 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,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'; {{#apiInfo}} @@ -10,7 +10,7 @@ import { {{classname}} } from './{{importPath}}'; {{/apiInfo}} @NgModule({ - imports: [ CommonModule, HttpModule ], + imports: [ CommonModule, HttpClientModule ], declarations: [], exports: [], providers: [ {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, {{/hasMore}}{{/apis}}{{/apiInfo}} ] From 6e5b57e453bc1faf666f52f5e5356a51d5190cc1 Mon Sep 17 00:00:00 2001 From: Esteban Marin Date: Thu, 19 Oct 2017 15:40:54 +0200 Subject: [PATCH 2/4] #6727: import http client module or http module, depending on setting --- .../main/resources/typescript-angular/api.module.mustache | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 1d5362988b7..30db73d009b 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, HttpClientModule ], + imports: [ CommonModule, {{#useHttpClient}}HttpClientModule{{/useHttpClient}}{{^useHttpClient}}{{/useHttpClient}} ], declarations: [], exports: [], providers: [ {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, {{/hasMore}}{{/apis}}{{/apiInfo}} ] From 535ce3091548aed44405fc4e33d584ceb6ce8681 Mon Sep 17 00:00:00 2001 From: Esteban Marin Date: Thu, 19 Oct 2017 15:46:52 +0200 Subject: [PATCH 3/4] #6727: import http client module or http module, depending on setting --- .../src/main/resources/typescript-angular/api.module.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30db73d009b..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 @@ -15,7 +15,7 @@ import { {{classname}} } from './{{importPath}}'; {{/apiInfo}} @NgModule({ - imports: [ CommonModule, {{#useHttpClient}}HttpClientModule{{/useHttpClient}}{{^useHttpClient}}{{/useHttpClient}} ], + imports: [ CommonModule, {{#useHttpClient}}HttpClientModule{{/useHttpClient}}{{^useHttpClient}}HttpModule{{/useHttpClient}} ], declarations: [], exports: [], providers: [ {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, {{/hasMore}}{{/apis}}{{/apiInfo}} ] From 783440814b6931ad1b24172be62f5ef3bbf34140 Mon Sep 17 00:00:00 2001 From: Esteban Marin Date: Thu, 19 Oct 2017 15:48:36 +0200 Subject: [PATCH 4/4] #6727: generate samples --- .../typescript-angular-v2/default/model/ApiResponse.ts | 2 ++ .../typescript-angular-v2/default/model/category.ts | 2 ++ .../petstore/typescript-angular-v2/default/model/order.ts | 2 ++ .../petstore/typescript-angular-v2/default/model/pet.ts | 2 ++ .../petstore/typescript-angular-v2/default/model/tag.ts | 2 ++ .../petstore/typescript-angular-v2/default/model/user.ts | 2 ++ .../typescript-angular-v2/npm/model/ApiResponse.ts | 2 ++ .../petstore/typescript-angular-v2/npm/model/category.ts | 2 ++ .../petstore/typescript-angular-v2/npm/model/order.ts | 2 ++ .../petstore/typescript-angular-v2/npm/model/pet.ts | 2 ++ .../petstore/typescript-angular-v2/npm/model/tag.ts | 2 ++ .../petstore/typescript-angular-v2/npm/model/user.ts | 2 ++ .../with-interfaces/model/Category.ts | 2 ++ .../typescript-angular-v2/with-interfaces/model/Order.ts | 2 ++ .../typescript-angular-v2/with-interfaces/model/Pet.ts | 2 ++ .../typescript-angular-v2/with-interfaces/model/Tag.ts | 2 ++ .../typescript-angular-v2/with-interfaces/model/User.ts | 2 ++ .../with-interfaces/model/apiResponse.ts | 2 ++ .../petstore/typescript-angular-v4.3/npm/api.module.ts | 4 ++-- .../typescript-angular-v4.3/npm/model/apiResponse.ts | 2 ++ .../typescript-angular-v4.3/npm/model/category.ts | 2 ++ .../petstore/typescript-angular-v4.3/npm/model/order.ts | 8 +++----- .../petstore/typescript-angular-v4.3/npm/model/pet.ts | 8 +++----- .../petstore/typescript-angular-v4.3/npm/model/tag.ts | 2 ++ .../petstore/typescript-angular-v4.3/npm/model/user.ts | 2 ++ .../typescript-angular-v4/npm/model/apiResponse.ts | 2 ++ .../petstore/typescript-angular-v4/npm/model/category.ts | 2 ++ .../petstore/typescript-angular-v4/npm/model/order.ts | 2 ++ .../petstore/typescript-angular-v4/npm/model/pet.ts | 2 ++ .../petstore/typescript-angular-v4/npm/model/tag.ts | 2 ++ .../petstore/typescript-angular-v4/npm/model/user.ts | 2 ++ 31 files changed, 64 insertions(+), 12 deletions(-) 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 3af781cf580..e79fabe8c8c 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts @@ -23,3 +23,5 @@ export interface ApiResponse { 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 d09f8d7b265..56608731f95 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/category.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/category.ts @@ -21,3 +21,5 @@ export interface Category { 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 4639b8c2949..84b59f1b09a 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/order.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/order.ts @@ -35,3 +35,5 @@ export interface Order { export namespace Order { export type StatusEnum = 'placed' | 'approved' | 'delivered'; } + + 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 ce6c535b867..c0fc942934c 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/pet.ts @@ -37,3 +37,5 @@ export interface Pet { export namespace Pet { export type StatusEnum = 'available' | 'pending' | 'sold'; } + + 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 3ed1eeff8f3..dbfa473f538 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/tag.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/tag.ts @@ -21,3 +21,5 @@ export interface Tag { 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 f4914ae2608..4dfad607c51 100644 --- a/samples/client/petstore/typescript-angular-v2/default/model/user.ts +++ b/samples/client/petstore/typescript-angular-v2/default/model/user.ts @@ -36,3 +36,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 3af781cf580..e79fabe8c8c 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts @@ -23,3 +23,5 @@ export interface ApiResponse { 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 d09f8d7b265..56608731f95 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/category.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/category.ts @@ -21,3 +21,5 @@ export interface Category { 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 4639b8c2949..84b59f1b09a 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/order.ts @@ -35,3 +35,5 @@ export interface Order { export namespace Order { export type StatusEnum = 'placed' | 'approved' | 'delivered'; } + + 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 ce6c535b867..c0fc942934c 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/pet.ts @@ -37,3 +37,5 @@ export interface Pet { export namespace Pet { export type StatusEnum = 'available' | 'pending' | 'sold'; } + + 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 3ed1eeff8f3..dbfa473f538 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/tag.ts @@ -21,3 +21,5 @@ export interface Tag { 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 f4914ae2608..4dfad607c51 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/model/user.ts +++ b/samples/client/petstore/typescript-angular-v2/npm/model/user.ts @@ -36,3 +36,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 d09f8d7b265..56608731f95 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 @@ -21,3 +21,5 @@ export interface Category { 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 4639b8c2949..84b59f1b09a 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 @@ -35,3 +35,5 @@ export interface Order { export namespace Order { export type StatusEnum = 'placed' | 'approved' | 'delivered'; } + + 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 ce6c535b867..c0fc942934c 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 @@ -37,3 +37,5 @@ export interface Pet { export namespace Pet { export type StatusEnum = 'available' | 'pending' | 'sold'; } + + 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 3ed1eeff8f3..dbfa473f538 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 @@ -21,3 +21,5 @@ export interface Tag { 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 f4914ae2608..4dfad607c51 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 @@ -36,3 +36,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 3af781cf580..e79fabe8c8c 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 @@ -23,3 +23,5 @@ export interface ApiResponse { 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.3/npm/model/apiResponse.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts index 3af781cf580..e79fabe8c8c 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts @@ -23,3 +23,5 @@ export interface ApiResponse { message?: string; } + + diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts index d09f8d7b265..56608731f95 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts @@ -21,3 +21,5 @@ export interface Category { name?: string; } + + diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts index 402a86689c8..84b59f1b09a 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts @@ -33,9 +33,7 @@ export interface Order { } export namespace Order { - export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' - } + export type StatusEnum = 'placed' | 'approved' | 'delivered'; } + + diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts index 0d6137d02cf..c0fc942934c 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts @@ -35,9 +35,7 @@ export interface Pet { } export namespace Pet { - export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' - } + export type StatusEnum = 'available' | 'pending' | 'sold'; } + + diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts index 3ed1eeff8f3..dbfa473f538 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts @@ -21,3 +21,5 @@ export interface Tag { name?: string; } + + diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts b/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts index f4914ae2608..4dfad607c51 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts +++ b/samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts @@ -36,3 +36,5 @@ export interface User { userStatus?: number; } + + 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 3af781cf580..e79fabe8c8c 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts @@ -23,3 +23,5 @@ export interface ApiResponse { 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 d09f8d7b265..56608731f95 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/category.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/category.ts @@ -21,3 +21,5 @@ export interface Category { 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 4639b8c2949..84b59f1b09a 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/order.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/order.ts @@ -35,3 +35,5 @@ export interface Order { export namespace Order { export type StatusEnum = 'placed' | 'approved' | 'delivered'; } + + 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 ce6c535b867..c0fc942934c 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/pet.ts @@ -37,3 +37,5 @@ export interface Pet { export namespace Pet { export type StatusEnum = 'available' | 'pending' | 'sold'; } + + 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 3ed1eeff8f3..dbfa473f538 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/tag.ts @@ -21,3 +21,5 @@ export interface Tag { 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 f4914ae2608..4dfad607c51 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/model/user.ts +++ b/samples/client/petstore/typescript-angular-v4/npm/model/user.ts @@ -36,3 +36,5 @@ export interface User { userStatus?: number; } + +