Skip to content

Commit cce09fe

Browse files
HugoMarioHugoMario
committed
fixed form parameters placed in wrong function.
1 parent b30acc3 commit cce09fe

File tree

2 files changed

+38
-14
lines changed

2 files changed

+38
-14
lines changed

‎src/main/resources/handlebars/typescript-angular/api.service.mustache

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ export class {{classname}} {
9797
{{#parameters}}* @param {{paramName}} {{description}}
9898
{{/parameters}}*/
9999
{{! if you change this method signature, also change the version below }}
100-
public {{nickname}}({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/parameters}}{{^useHttpClient}}{{#hasParams}}, {{/hasParams}}extraHttpRequestParams?: RequestOptionsArgs{{/useHttpClient}}): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
101-
return this.{{nickname}}WithHttpInfo({{#parameters}}{{paramName}}, {{/parameters}}extraHttpRequestParams)
100+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/parameters}}{{^useHttpClient}}{{#hasParams}}, {{/hasParams}}extraHttpRequestParams?: RequestOptionsArgs{{/useHttpClient}}): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
101+
return this.{{nickname}}{{#isForm}}Form{{/isForm}}WithHttpInfo({{#parameters}}{{paramName}}, {{/parameters}}extraHttpRequestParams)
102102
.map((response: Response) => {
103103
if (response.status === 204) {
104104
return undefined;
@@ -127,10 +127,10 @@ export class {{classname}} {
127127
* @param reportProgress flag to report request and response progress.{{/useHttpClient}}
128128
*/
129129
{{#useHttpClient}}
130-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'body', reportProgress?: boolean): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>;
131-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
132-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
133-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
130+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'body', reportProgress?: boolean): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>;
131+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
132+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
133+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
134134
{{/useHttpClient}}
135135
{{^useHttpClient}}
136136
public {{nickname}}WithHttpInfo({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/parameters}}extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
@@ -258,6 +258,7 @@ export class {{classname}} {
258258
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
259259
{{/consumes}}
260260
];
261+
{{^isForm}}
261262
{{#bodyParam}}
262263
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
263264
if (httpContentTypeSelected != undefined) {
@@ -269,7 +270,9 @@ export class {{classname}} {
269270
{{/useHttpClient}}
270271
}
271272
{{/bodyParam}}
273+
{{/isForm}}
272274

275+
{{#isForm}}
273276
{{#hasFormParams}}
274277
const canConsumeForm = this.canConsumeForm(consumes);
275278

@@ -319,15 +322,20 @@ export class {{classname}} {
319322
{{/formParams}}
320323

321324
{{/hasFormParams}}
325+
{{/isForm}}
322326
{{#useHttpClient}}
323327
return this.httpClient.request{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}('{{httpMethod}}',`${this.basePath}{{{path}}}`,
324328
{
329+
{{^isForm}}
325330
{{#bodyParam}}
326331
body: {{paramName}},
327332
{{/bodyParam}}
333+
{{/isForm}}
334+
{{#isForm}}
328335
{{#hasFormParams}}
329336
body: convertFormParamsToString ? formParams.toString() : formParams,
330337
{{/hasFormParams}}
338+
{{/isForm}}
331339
{{#hasQueryParams}}
332340
params: queryParameters,
333341
{{/hasQueryParams}}
@@ -345,12 +353,16 @@ export class {{classname}} {
345353
let requestOptions: RequestOptionsArgs = new RequestOptions({
346354
method: '{{httpMethod}}',
347355
headers: headers,
356+
{{^isForm}}
348357
{{#bodyParam}}
349358
body: {{paramName}} == null ? '' : JSON.stringify({{paramName}}), // https://github.com/angular/angular/issues/10612
350359
{{/bodyParam}}
360+
{{/isForm}}
361+
{{#isForm}}
351362
{{#hasFormParams}}
352363
body: convertFormParamsToString ? formParams.toString() : formParams,
353364
{{/hasFormParams}}
365+
{{/isForm}}
354366
{{#isResponseFile}}
355367
responseType: ResponseContentType.Blob,
356368
{{/isResponseFile}}

‎src/main/resources/mustache/typescript-angular/api.service.mustache

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ export class {{classname}} {
9797
{{#parameters}}* @param {{paramName}} {{description}}
9898
{{/parameters}}*/
9999
{{! if you change this method signature, also change the version below }}
100-
public {{nickname}}({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/parameters}}{{^useHttpClient}}{{#hasParams}}, {{/hasParams}}extraHttpRequestParams?: RequestOptionsArgs{{/useHttpClient}}): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
101-
return this.{{nickname}}WithHttpInfo({{#parameters}}{{paramName}}, {{/parameters}}extraHttpRequestParams)
100+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/parameters}}{{^useHttpClient}}{{#hasParams}}, {{/hasParams}}extraHttpRequestParams?: RequestOptionsArgs{{/useHttpClient}}): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
101+
return this.{{nickname}}{{#isForm}}Form{{/isForm}}WithHttpInfo({{#parameters}}{{paramName}}, {{/parameters}}extraHttpRequestParams)
102102
.map((response: Response) => {
103103
if (response.status === 204) {
104104
return undefined;
@@ -127,10 +127,10 @@ export class {{classname}} {
127127
* @param reportProgress flag to report request and response progress.{{/useHttpClient}}
128128
*/
129129
{{#useHttpClient}}
130-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'body', reportProgress?: boolean): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>;
131-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
132-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
133-
public {{nickname}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
130+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'body', reportProgress?: boolean): Observable<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>;
131+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
132+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
133+
public {{nickname}}{{#isForm}}Form{{/isForm}}({{#parameters}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/parameters}}observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
134134
{{/useHttpClient}}
135135
{{^useHttpClient}}
136136
public {{nickname}}WithHttpInfo({{#parameters}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/parameters}}extraHttpRequestParams?: RequestOptionsArgs): Observable<Response> {
@@ -258,6 +258,7 @@ export class {{classname}} {
258258
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
259259
{{/consumes}}
260260
];
261+
{{^isForm}}
261262
{{#bodyParam}}
262263
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
263264
if (httpContentTypeSelected != undefined) {
@@ -269,19 +270,21 @@ export class {{classname}} {
269270
{{/useHttpClient}}
270271
}
271272
{{/bodyParam}}
273+
{{/isForm}}
272274

275+
{{#isForm}}
273276
{{#hasFormParams}}
274277
const canConsumeForm = this.canConsumeForm(consumes);
275278

276279
let formParams: { append(param: string, value: any): void; };
277280
let useForm = false;
278281
let convertFormParamsToString = false;
279282
{{#formParams}}
280-
{{#isFile}}
283+
{{#isBinary}}
281284
// use FormData to transmit files using content-type "multipart/form-data"
282285
// see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data
283286
useForm = canConsumeForm;
284-
{{/isFile}}
287+
{{/isBinary}}
285288
{{/formParams}}
286289
if (useForm) {
287290
formParams = new FormData();
@@ -319,15 +322,20 @@ export class {{classname}} {
319322
{{/formParams}}
320323

321324
{{/hasFormParams}}
325+
{{/isForm}}
322326
{{#useHttpClient}}
323327
return this.httpClient.request{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}('{{httpMethod}}',`${this.basePath}{{{path}}}`,
324328
{
329+
{{^isForm}}
325330
{{#bodyParam}}
326331
body: {{paramName}},
327332
{{/bodyParam}}
333+
{{/isForm}}
334+
{{#isForm}}
328335
{{#hasFormParams}}
329336
body: convertFormParamsToString ? formParams.toString() : formParams,
330337
{{/hasFormParams}}
338+
{{/isForm}}
331339
{{#hasQueryParams}}
332340
params: queryParameters,
333341
{{/hasQueryParams}}
@@ -345,12 +353,16 @@ export class {{classname}} {
345353
let requestOptions: RequestOptionsArgs = new RequestOptions({
346354
method: '{{httpMethod}}',
347355
headers: headers,
356+
{{^isForm}}
348357
{{#bodyParam}}
349358
body: {{paramName}} == null ? '' : JSON.stringify({{paramName}}), // https://github.com/angular/angular/issues/10612
350359
{{/bodyParam}}
360+
{{/isForm}}
361+
{{#isForm}}
351362
{{#hasFormParams}}
352363
body: convertFormParamsToString ? formParams.toString() : formParams,
353364
{{/hasFormParams}}
365+
{{/isForm}}
354366
{{#isResponseFile}}
355367
responseType: ResponseContentType.Blob,
356368
{{/isResponseFile}}

0 commit comments

Comments
 (0)