Skip to content

Commit 04754cc

Browse files
authored
Merge pull request #10380 from swagger-api/marcbuils-issue-8836
Marcbuils issue 8836
2 parents b9a731a + 309f7bd commit 04754cc

File tree

15 files changed

+24
-19
lines changed

15 files changed

+24
-19
lines changed

modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,12 @@ export class {{classname}} {
262262
{{#hasFormParams}}
263263
const canConsumeForm = this.canConsumeForm(consumes);
264264

265+
{{^useHttpClient}}
265266
let formParams: { append(param: string, value: any): void; };
267+
{{/useHttpClient}}
268+
{{#useHttpClient}}
269+
let formParams: { append(param: string, value: any): void | HttpParams; };
270+
{{/useHttpClient}}
266271
let useForm = false;
267272
let convertFormParamsToString = false;
268273
{{#formParams}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.15-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.15-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.15-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.12-SNAPSHOT

samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ export class PetService {
432432

433433
const canConsumeForm = this.canConsumeForm(consumes);
434434

435-
let formParams: { append(param: string, value: any): void; };
435+
let formParams: { append(param: string, value: any): void | HttpParams; };
436436
let useForm = false;
437437
let convertFormParamsToString = false;
438438
if (useForm) {
@@ -505,7 +505,7 @@ export class PetService {
505505

506506
const canConsumeForm = this.canConsumeForm(consumes);
507507

508-
let formParams: { append(param: string, value: any): void; };
508+
let formParams: { append(param: string, value: any): void | HttpParams; };
509509
let useForm = false;
510510
let convertFormParamsToString = false;
511511
// use FormData to transmit files using content-type "multipart/form-data"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.12-SNAPSHOT

samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ export class PetService implements PetServiceInterface {
433433

434434
const canConsumeForm = this.canConsumeForm(consumes);
435435

436-
let formParams: { append(param: string, value: any): void; };
436+
let formParams: { append(param: string, value: any): void | HttpParams; };
437437
let useForm = false;
438438
let convertFormParamsToString = false;
439439
if (useForm) {
@@ -506,7 +506,7 @@ export class PetService implements PetServiceInterface {
506506

507507
const canConsumeForm = this.canConsumeForm(consumes);
508508

509-
let formParams: { append(param: string, value: any): void; };
509+
let formParams: { append(param: string, value: any): void | HttpParams; };
510510
let useForm = false;
511511
let convertFormParamsToString = false;
512512
// use FormData to transmit files using content-type "multipart/form-data"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.15-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.12-SNAPSHOT
1+
2.4.12-SNAPSHOT

0 commit comments

Comments
 (0)