Skip to content

[TypeScript][Angular] fix issue with importing http client module #6757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 5 commits into from
Oct 25, 2017
Merged

[TypeScript][Angular] fix issue with importing http client module #6757

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41a134d
[angular-typescript] imports HttpClientModule
JohannesHoppe Oct 18, 2017
6e5b57e
#6727: import http client module or http module, depending on setting
macjohnny Oct 19, 2017
535ce30
#6727: import http client module or http module, depending on setting
macjohnny Oct 19, 2017
7834408
#6727: generate samples
macjohnny Oct 19, 2017
01cf839
Merge branch 'master' into bugfix/6727-import-http-client-module
macjohnny Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}
Expand All @@ -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}} ]
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/ApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ export interface ApiResponse {
message?: string;

}
Copy link
Contributor

@sebastianhaas sebastianhaas Oct 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still wondering about those newlines

Copy link
Contributor

@wing328 wing328 Oct 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can try to clean it up later with a separate PR.

Copy link
Contributor

@kenisteward kenisteward Oct 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened #6788 to address this :)



2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Category {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ export interface Order {
export namespace Order {
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ export interface Pet {
export namespace Pet {
export type StatusEnum = 'available' | 'pending' | 'sold';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Tag {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/default/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ export interface User {
userStatus?: number;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/ApiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ export interface ApiResponse {
message?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Category {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ export interface Order {
export namespace Order {
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ export interface Pet {
export namespace Pet {
export type StatusEnum = 'available' | 'pending' | 'sold';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Tag {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/npm/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ export interface User {
userStatus?: number;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/Category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Category {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ export interface Order {
export namespace Order {
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ export interface Pet {
export namespace Pet {
export type StatusEnum = 'available' | 'pending' | 'sold';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Tag {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ export interface User {
userStatus?: number;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/model/apiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ export interface ApiResponse {
message?: string;

}


4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular-v4.3/npm/api.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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';
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 ]
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/apiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ export interface ApiResponse {
message?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Category {
name?: string;

}


8 changes: 3 additions & 5 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ export interface Order {

}
export namespace Order {
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
}
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}


8 changes: 3 additions & 5 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ export interface Pet {

}
export namespace Pet {
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
}
export type StatusEnum = 'available' | 'pending' | 'sold';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Tag {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4.3/npm/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ export interface User {
userStatus?: number;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/apiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ export interface ApiResponse {
message?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Category {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ export interface Order {
export namespace Order {
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ export interface Pet {
export namespace Pet {
export type StatusEnum = 'available' | 'pending' | 'sold';
}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ export interface Tag {
name?: string;

}


2 changes: 2 additions & 0 deletions samples/client/petstore/typescript-angular-v4/npm/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ export interface User {
userStatus?: number;

}