From c203854254af4a44e8e59709fb691d4df1353669 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 20 Sep 2015 22:59:56 +0800 Subject: [PATCH 1/5] fix parameter name for typescript-node using baseName --- .../main/resources/TypeScript-node/api.mustache | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index 5f6428ce7e2..eab02d5c4d1 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -160,37 +160,35 @@ export class {{classname}} { var path = this.url + this.basePath + '{{path}}'; {{#pathParams}} - path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}})); + path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}})); {{/pathParams}} var queryParameters: any = {}; var headerParams: any = {}; var formParams: any = {}; -{{#allParams}} -{{#required}} +{{#allParams}}{{#required}} // verify required parameter '{{paramName}}' is set if (!{{paramName}}) { throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}'); } -{{/required}} -{{/allParams}} +{{/required}}{{/allParams}} {{#queryParams}} if ({{paramName}} !== undefined) { - queryParameters['{{paramName}}'] = {{paramName}}; + queryParameters['{{baseName}}'] = {{paramName}}; } {{/queryParams}} {{#headerParams}} - headerParams['{{paramName}}'] = {{paramName}}; + headerParams['{{baseName}}'] = {{paramName}}; {{/headerParams}} var useFormData = false; {{#formParams}} if ({{paramName}} !== undefined) { - formParams['{{paramName}}'] = {{paramName}}; + formParams['{baseName}}'] = {{paramName}}; } {{#isFile}} useFormData = true; From 8733be9ac95364221bb6b233ef7d9294adc1e6fb Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 20 Sep 2015 23:06:29 +0800 Subject: [PATCH 2/5] update sample, fix formData basename --- .../resources/TypeScript-node/api.mustache | 2 +- .../client/petstore/typescript-node/api.ts | 39 ++++++++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index eab02d5c4d1..95373b21da2 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -188,7 +188,7 @@ export class {{classname}} { {{#formParams}} if ({{paramName}} !== undefined) { - formParams['{baseName}}'] = {{paramName}}; + formParams['{{baseName}}'] = {{paramName}}; } {{#isFile}} useFormData = true; diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 52a3d7f9706..0cdad04ba38 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -149,6 +149,7 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -194,6 +195,7 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -239,6 +241,7 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -284,6 +287,7 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + if (username !== undefined) { queryParameters['username'] = username; } @@ -336,6 +340,7 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -382,11 +387,13 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling getUserByName'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); @@ -433,11 +440,13 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling updateUser'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -485,11 +494,13 @@ export class UserApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'username' is set if (!username) { throw new Error('Missing required parameter username when calling deleteUser'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -559,6 +570,7 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -606,6 +618,7 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -653,6 +666,7 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + if (status !== undefined) { queryParameters['status'] = status; } @@ -703,6 +717,7 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + if (tags !== undefined) { queryParameters['tags'] = tags; } @@ -755,11 +770,13 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling getPetById'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); @@ -810,19 +827,21 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } + var useFormData = false; if (name !== undefined) { - formParams['name'] = name; + formParams['{baseName}}'] = name; } if (status !== undefined) { - formParams['status'] = status; + formParams['{baseName}}'] = status; } var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -871,12 +890,14 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling deletePet'); } - headerParams['apiKey'] = apiKey; + + headerParams['api_key'] = apiKey; var useFormData = false; @@ -926,19 +947,21 @@ export class PetApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'petId' is set if (!petId) { throw new Error('Missing required parameter petId when calling uploadFile'); } + var useFormData = false; if (additionalMetadata !== undefined) { - formParams['additionalMetadata'] = additionalMetadata; + formParams['{baseName}}'] = additionalMetadata; } if (file !== undefined) { - formParams['file'] = file; + formParams['{baseName}}'] = file; } useFormData = true; @@ -1011,6 +1034,7 @@ export class StoreApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>(); @@ -1057,6 +1081,7 @@ export class StoreApi { var headerParams: any = {}; var formParams: any = {}; + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); @@ -1104,11 +1129,13 @@ export class StoreApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling getOrderById'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); @@ -1155,11 +1182,13 @@ export class StoreApi { var headerParams: any = {}; var formParams: any = {}; + // verify required parameter 'orderId' is set if (!orderId) { throw new Error('Missing required parameter orderId when calling deleteOrder'); } + var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); From b1728aed7c140f626dc9862c554c976fcbb62568 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 20 Sep 2015 23:11:46 +0800 Subject: [PATCH 3/5] update sample for typescript-node --- samples/client/petstore/typescript-node/api.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 0cdad04ba38..0723e067be4 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -837,11 +837,11 @@ export class PetApi { var useFormData = false; if (name !== undefined) { - formParams['{baseName}}'] = name; + formParams['name'] = name; } if (status !== undefined) { - formParams['{baseName}}'] = status; + formParams['status'] = status; } var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -957,11 +957,11 @@ export class PetApi { var useFormData = false; if (additionalMetadata !== undefined) { - formParams['{baseName}}'] = additionalMetadata; + formParams['additionalMetadata'] = additionalMetadata; } if (file !== undefined) { - formParams['{baseName}}'] = file; + formParams['file'] = file; } useFormData = true; From 956624f1a4470584fffc4088e5948471db8421e7 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 20 Sep 2015 23:15:02 +0800 Subject: [PATCH 4/5] remove extra line break for typescript-node --- .../src/main/resources/TypeScript-node/api.mustache | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index 95373b21da2..6528a5d3a22 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -172,7 +172,6 @@ export class {{classname}} { if (!{{paramName}}) { throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}'); } - {{/required}}{{/allParams}} {{#queryParams}} if ({{paramName}} !== undefined) { From 2b06a81a52ce7f6bac92b7057bfc2dfa50846a21 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 20 Sep 2015 23:17:04 +0800 Subject: [PATCH 5/5] remove extra line break in typescript-node sample code --- samples/client/petstore/typescript-node/api.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 0723e067be4..148782a4000 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -393,7 +393,6 @@ export class UserApi { throw new Error('Missing required parameter username when calling getUserByName'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: User; }>(); @@ -446,7 +445,6 @@ export class UserApi { throw new Error('Missing required parameter username when calling updateUser'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -500,7 +498,6 @@ export class UserApi { throw new Error('Missing required parameter username when calling deleteUser'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>(); @@ -776,7 +773,6 @@ export class PetApi { throw new Error('Missing required parameter petId when calling getPetById'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: Pet; }>(); @@ -833,7 +829,6 @@ export class PetApi { throw new Error('Missing required parameter petId when calling updatePetWithForm'); } - var useFormData = false; if (name !== undefined) { @@ -896,7 +891,6 @@ export class PetApi { throw new Error('Missing required parameter petId when calling deletePet'); } - headerParams['api_key'] = apiKey; var useFormData = false; @@ -953,7 +947,6 @@ export class PetApi { throw new Error('Missing required parameter petId when calling uploadFile'); } - var useFormData = false; if (additionalMetadata !== undefined) { @@ -1135,7 +1128,6 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling getOrderById'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>(); @@ -1188,7 +1180,6 @@ export class StoreApi { throw new Error('Missing required parameter orderId when calling deleteOrder'); } - var useFormData = false; var deferred = promise.defer<{ response: http.ClientResponse; }>();