From 449ba4f64470592e0c08035a877919a5f47f0a0b Mon Sep 17 00:00:00 2001 From: Martin Hardorf Date: Thu, 18 Jun 2015 12:42:04 +0200 Subject: [PATCH] Fixed required parameters for APIs in TypeScript --- .../resources/TypeScript-Angular/api.mustache | 10 +++++----- .../resources/TypeScript-node/api.mustache | 10 +++++----- .../petstore/typescript-angular/api/PetApi.ts | 20 +++++++++++++++++++ .../typescript-angular/api/StoreApi.ts | 10 ++++++++++ .../typescript-angular/api/UserApi.ts | 15 ++++++++++++++ .../petstore/typescript-node/api/PetApi.ts | 20 +++++++++++++++++++ .../petstore/typescript-node/api/StoreApi.ts | 10 ++++++++++ .../petstore/typescript-node/api/UserApi.ts | 15 ++++++++++++++ 8 files changed, 100 insertions(+), 10 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache index 3b53e816891..1095667b245 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache @@ -29,12 +29,12 @@ module {{package}} { {{/pathParams}} var queryParameters: any = {}; var headers: any = {}; - {{#requiredParamCount}} - // verify required params are set - if ({{/requiredParamCount}}{{#requiredParams}} !{{paramName}} {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { - throw new Error('Missing required parameter: {{¶mName}}'); + {{#allParams}}{{#required}} + // verify required parameter '{{paramName}}' is set + if (!{{paramName}}) { + throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}'); } - {{/requiredParamCount}} + {{/required}}{{/allParams}} {{#queryParams}}if ({{paramName}} !== undefined) { queryParameters['{{paramName}}'] = {{paramName}}; }{{/queryParams}} 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 4b329799ad5..156ad63f72d 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -26,12 +26,12 @@ export class {{classname}} { var queryParameters: any = {}; var headers: any = {}; - {{#requiredParamCount}} - // verify required params are set - if ({{/requiredParamCount}}{{#requiredParams}} !{{paramName}} {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) { - throw new Error('Missing required parameter: {{¶mName}}'); + {{#allParams}}{{#required}} + // verify required parameter '{{paramName}}' is set + if (!{{paramName}}) { + throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}'); } - {{/requiredParamCount}} + {{/required}}{{/allParams}} {{#queryParams}}if ({{paramName}} !== undefined) { queryParameters['{{paramName}}'] = {{paramName}}; diff --git a/samples/client/petstore/typescript-angular/api/PetApi.ts b/samples/client/petstore/typescript-angular/api/PetApi.ts index 2c5f2a25b6d..d294cfbebbc 100644 --- a/samples/client/petstore/typescript-angular/api/PetApi.ts +++ b/samples/client/petstore/typescript-angular/api/PetApi.ts @@ -143,6 +143,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling getPetById'); + } + var httpRequestParams: any = { @@ -173,6 +178,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling updatePetWithForm'); + } + var httpRequestParams: any = { @@ -203,6 +213,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling deletePet'); + } + headerParams['apiKey'] = apiKey; var httpRequestParams: any = { @@ -233,6 +248,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling uploadFile'); + } + var httpRequestParams: any = { diff --git a/samples/client/petstore/typescript-angular/api/StoreApi.ts b/samples/client/petstore/typescript-angular/api/StoreApi.ts index e4c9e48e0e9..e8c85b00c45 100644 --- a/samples/client/petstore/typescript-angular/api/StoreApi.ts +++ b/samples/client/petstore/typescript-angular/api/StoreApi.ts @@ -82,6 +82,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling getOrderById'); + } + var httpRequestParams: any = { @@ -112,6 +117,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling deleteOrder'); + } + var httpRequestParams: any = { diff --git a/samples/client/petstore/typescript-angular/api/UserApi.ts b/samples/client/petstore/typescript-angular/api/UserApi.ts index dfbe9032dba..40d82f73852 100644 --- a/samples/client/petstore/typescript-angular/api/UserApi.ts +++ b/samples/client/petstore/typescript-angular/api/UserApi.ts @@ -172,6 +172,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling getUserByName'); + } + var httpRequestParams: any = { @@ -202,6 +207,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling updateUser'); + } + var httpRequestParams: any = { @@ -233,6 +243,11 @@ module api { var queryParameters: any = {}; var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling deleteUser'); + } + var httpRequestParams: any = { diff --git a/samples/client/petstore/typescript-node/api/PetApi.ts b/samples/client/petstore/typescript-node/api/PetApi.ts index c948f8036e6..02605f2c8a8 100644 --- a/samples/client/petstore/typescript-node/api/PetApi.ts +++ b/samples/client/petstore/typescript-node/api/PetApi.ts @@ -193,6 +193,11 @@ export class PetApi { var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling getPetById'); + } + @@ -236,6 +241,11 @@ export class PetApi { var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling updatePetWithForm'); + } + @@ -279,6 +289,11 @@ export class PetApi { var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling deletePet'); + } + @@ -323,6 +338,11 @@ export class PetApi { var headers: any = {}; + // verify required parameter 'petId' is set + if (!petId) { + throw new Error('Missing required parameter petId when calling uploadFile'); + } + diff --git a/samples/client/petstore/typescript-node/api/StoreApi.ts b/samples/client/petstore/typescript-node/api/StoreApi.ts index 1c2c6623523..71cfe106fca 100644 --- a/samples/client/petstore/typescript-node/api/StoreApi.ts +++ b/samples/client/petstore/typescript-node/api/StoreApi.ts @@ -104,6 +104,11 @@ export class StoreApi { var headers: any = {}; + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling getOrderById'); + } + @@ -147,6 +152,11 @@ export class StoreApi { var headers: any = {}; + // verify required parameter 'orderId' is set + if (!orderId) { + throw new Error('Missing required parameter orderId when calling deleteOrder'); + } + diff --git a/samples/client/petstore/typescript-node/api/UserApi.ts b/samples/client/petstore/typescript-node/api/UserApi.ts index fa4365f8edc..ca6fd41c593 100644 --- a/samples/client/petstore/typescript-node/api/UserApi.ts +++ b/samples/client/petstore/typescript-node/api/UserApi.ts @@ -235,6 +235,11 @@ export class UserApi { var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling getUserByName'); + } + @@ -278,6 +283,11 @@ export class UserApi { var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling updateUser'); + } + @@ -322,6 +332,11 @@ export class UserApi { var headers: any = {}; + // verify required parameter 'username' is set + if (!username) { + throw new Error('Missing required parameter username when calling deleteUser'); + } +