From a916696f28fbc223e7e90fe43ba490b12372f889 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 21 Jul 2016 17:44:10 +0800 Subject: [PATCH] fix #3427 using String() (#3431) --- .../typescript-angular2/api.mustache | 4 +-- .../typescript-angular2/default/api/PetApi.ts | 30 +++++++++---------- .../default/api/StoreApi.ts | 12 ++++---- .../default/api/UserApi.ts | 22 +++++++------- .../typescript-angular2/npm/README.md | 4 +-- .../typescript-angular2/npm/api/PetApi.ts | 30 +++++++++---------- .../typescript-angular2/npm/api/StoreApi.ts | 12 ++++---- .../typescript-angular2/npm/api/UserApi.ts | 22 +++++++------- .../typescript-angular2/npm/package.json | 2 +- 9 files changed, 69 insertions(+), 69 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache index 15bb69c5b84..c0645280549 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache @@ -52,12 +52,12 @@ export class {{classname}} { {{/allParams}} {{#queryParams}} if ({{paramName}} !== undefined) { - queryParameters.set('{{baseName}}', {{paramName}}); + queryParameters.set('{{baseName}}', String({{paramName}})); } {{/queryParams}} {{#headerParams}} - headerParams.set('{{baseName}}', {{paramName }}); + headerParams.set('{{baseName}}', String({{paramName}})); {{/headerParams}} {{#hasFormParams}} diff --git a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts b/samples/client/petstore/typescript-angular2/default/api/PetApi.ts index 0510c844e17..c030a169cb4 100644 --- a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/PetApi.ts @@ -82,11 +82,11 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling deletePet'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - headerParams.set('api_key', apiKey); + headerParams.set('api_key', String(apiKey)); let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -115,7 +115,7 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (status !== undefined) { - queryParameters.set('status', status); + queryParameters.set('status', String(status)); } let requestOptions: RequestOptionsArgs = { @@ -145,7 +145,7 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (tags !== undefined) { - queryParameters.set('tags', tags); + queryParameters.set('tags', String(tags)); } let requestOptions: RequestOptionsArgs = { @@ -175,9 +175,9 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling getPetById'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -237,9 +237,9 @@ export class PetApi { let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling updatePetWithForm'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } headerParams.set('Content-Type', 'application/x-www-form-urlencoded'); @@ -279,9 +279,9 @@ export class PetApi { let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling uploadFile'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } headerParams.set('Content-Type', 'application/x-www-form-urlencoded'); diff --git a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts index b2a88fb143e..a16fbe4db1a 100644 --- a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts @@ -54,9 +54,9 @@ export class StoreApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling deleteOrder'); + // verify required parameter 'orderId' is not null or undefined + if (orderId === null || orderId === undefined) { + throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -110,9 +110,9 @@ export class StoreApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling getOrderById'); + // verify required parameter 'orderId' is not null or undefined + if (orderId === null || orderId === undefined) { + throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', diff --git a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts b/samples/client/petstore/typescript-angular2/default/api/UserApi.ts index bb6974527c8..385c0a03f03 100644 --- a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/UserApi.ts @@ -135,9 +135,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling deleteUser'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -166,9 +166,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling getUserByName'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -198,11 +198,11 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (username !== undefined) { - queryParameters.set('username', username); + queryParameters.set('username', String(username)); } if (password !== undefined) { - queryParameters.set('password', password); + queryParameters.set('password', String(password)); } let requestOptions: RequestOptionsArgs = { @@ -258,9 +258,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling updateUser'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling updateUser.'); } let requestOptions: RequestOptionsArgs = { method: 'PUT', diff --git a/samples/client/petstore/typescript-angular2/npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md index 460230f55dc..81364f3a176 100644 --- a/samples/client/petstore/typescript-angular2/npm/README.md +++ b/samples/client/petstore/typescript-angular2/npm/README.md @@ -1,4 +1,4 @@ -## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201606191203 +## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201607211723 ### Building @@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's. _published:_ ``` -npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201606191203 --save +npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201607211723 --save ``` _unPublished (not recommended):_ diff --git a/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts b/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts index 0510c844e17..c030a169cb4 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts @@ -82,11 +82,11 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling deletePet'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling deletePet.'); } - headerParams.set('api_key', apiKey); + headerParams.set('api_key', String(apiKey)); let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -115,7 +115,7 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (status !== undefined) { - queryParameters.set('status', status); + queryParameters.set('status', String(status)); } let requestOptions: RequestOptionsArgs = { @@ -145,7 +145,7 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (tags !== undefined) { - queryParameters.set('tags', tags); + queryParameters.set('tags', String(tags)); } let requestOptions: RequestOptionsArgs = { @@ -175,9 +175,9 @@ export class PetApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling getPetById'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling getPetById.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -237,9 +237,9 @@ export class PetApi { let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling updatePetWithForm'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.'); } headerParams.set('Content-Type', 'application/x-www-form-urlencoded'); @@ -279,9 +279,9 @@ export class PetApi { let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); - // verify required parameter 'petId' is set - if (!petId) { - throw new Error('Missing required parameter petId when calling uploadFile'); + // verify required parameter 'petId' is not null or undefined + if (petId === null || petId === undefined) { + throw new Error('Required parameter petId was null or undefined when calling uploadFile.'); } headerParams.set('Content-Type', 'application/x-www-form-urlencoded'); diff --git a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts index b2a88fb143e..a16fbe4db1a 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts @@ -54,9 +54,9 @@ export class StoreApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling deleteOrder'); + // verify required parameter 'orderId' is not null or undefined + if (orderId === null || orderId === undefined) { + throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.'); } let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -110,9 +110,9 @@ export class StoreApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'orderId' is set - if (!orderId) { - throw new Error('Missing required parameter orderId when calling getOrderById'); + // verify required parameter 'orderId' is not null or undefined + if (orderId === null || orderId === undefined) { + throw new Error('Required parameter orderId was null or undefined when calling getOrderById.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', diff --git a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts b/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts index bb6974527c8..385c0a03f03 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts @@ -135,9 +135,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling deleteUser'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling deleteUser.'); } let requestOptions: RequestOptionsArgs = { method: 'DELETE', @@ -166,9 +166,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling getUserByName'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling getUserByName.'); } let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -198,11 +198,11 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (username !== undefined) { - queryParameters.set('username', username); + queryParameters.set('username', String(username)); } if (password !== undefined) { - queryParameters.set('password', password); + queryParameters.set('password', String(password)); } let requestOptions: RequestOptionsArgs = { @@ -258,9 +258,9 @@ export class UserApi { let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; - // verify required parameter 'username' is set - if (!username) { - throw new Error('Missing required parameter username when calling updateUser'); + // verify required parameter 'username' is not null or undefined + if (username === null || username === undefined) { + throw new Error('Required parameter username was null or undefined when calling updateUser.'); } let requestOptions: RequestOptionsArgs = { method: 'PUT', diff --git a/samples/client/petstore/typescript-angular2/npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json index c263ad2e7ae..e71da5c4663 100644 --- a/samples/client/petstore/typescript-angular2/npm/package.json +++ b/samples/client/petstore/typescript-angular2/npm/package.json @@ -1,6 +1,6 @@ { "name": "@swagger/angular2-typescript-petstore", - "version": "0.0.1-SNAPSHOT.201606191203", + "version": "0.0.1-SNAPSHOT.201607211723", "description": "swagger client for @swagger/angular2-typescript-petstore", "author": "Swagger Codegen Contributors", "keywords": [