From f195f8ff7a14ad88b8319537a229f75710c85e0c Mon Sep 17 00:00:00 2001 From: Esteban Gehring Date: Wed, 16 Oct 2019 08:44:38 +0200 Subject: [PATCH] typescript-rxjs: fix query parameters type (#4160) * #4159: fix typescript-rxjs query parameter type * re-generate typescript-rxjs samples --- .../src/main/resources/typescript-rxjs/apis.mustache | 2 +- .../petstore/typescript-rxjs/builds/default/apis/PetApi.ts | 4 ++-- .../petstore/typescript-rxjs/builds/default/apis/UserApi.ts | 2 +- .../petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts | 4 ++-- .../typescript-rxjs/builds/es6-target/apis/UserApi.ts | 2 +- .../typescript-rxjs/builds/with-interfaces/apis/PetApi.ts | 4 ++-- .../typescript-rxjs/builds/with-interfaces/apis/UserApi.ts | 2 +- .../typescript-rxjs/builds/with-npm-version/apis/PetApi.ts | 4 ++-- .../typescript-rxjs/builds/with-npm-version/apis/UserApi.ts | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache index 3c548d7b547..0c70dc5e6ca 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache @@ -86,7 +86,7 @@ export class {{classname}} extends BaseAPI { {{/hasHttpHeaders}} {{#hasQueryParams}} - const query: HttpQuery = { + const query: HttpQuery = { {{#queryParams}} {{#isListContainer}} {{#isCollectionFormatMulti}} diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts index a5328a8c728..16c0d116369 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts @@ -123,7 +123,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.status && { 'status': requestParameters.status.join(COLLECTION_FORMATS['csv']) }), }; @@ -151,7 +151,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.tags && { 'tags': requestParameters.tags.join(COLLECTION_FORMATS['csv']) }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts index 2194fdfe9f6..ed3aaa8e371 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts @@ -139,7 +139,7 @@ export class UserApi extends BaseAPI { throwIfRequired(requestParameters, 'username', 'loginUser'); throwIfRequired(requestParameters, 'password', 'loginUser'); - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.username && { 'username': requestParameters.username }), ...(requestParameters.password && { 'password': requestParameters.password }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts index a5328a8c728..16c0d116369 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts @@ -123,7 +123,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.status && { 'status': requestParameters.status.join(COLLECTION_FORMATS['csv']) }), }; @@ -151,7 +151,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.tags && { 'tags': requestParameters.tags.join(COLLECTION_FORMATS['csv']) }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts index 2194fdfe9f6..ed3aaa8e371 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts @@ -139,7 +139,7 @@ export class UserApi extends BaseAPI { throwIfRequired(requestParameters, 'username', 'loginUser'); throwIfRequired(requestParameters, 'password', 'loginUser'); - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.username && { 'username': requestParameters.username }), ...(requestParameters.password && { 'password': requestParameters.password }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts index a5328a8c728..16c0d116369 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts @@ -123,7 +123,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.status && { 'status': requestParameters.status.join(COLLECTION_FORMATS['csv']) }), }; @@ -151,7 +151,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.tags && { 'tags': requestParameters.tags.join(COLLECTION_FORMATS['csv']) }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts index 2194fdfe9f6..ed3aaa8e371 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts @@ -139,7 +139,7 @@ export class UserApi extends BaseAPI { throwIfRequired(requestParameters, 'username', 'loginUser'); throwIfRequired(requestParameters, 'password', 'loginUser'); - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.username && { 'username': requestParameters.username }), ...(requestParameters.password && { 'password': requestParameters.password }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts index a5328a8c728..16c0d116369 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts @@ -123,7 +123,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.status && { 'status': requestParameters.status.join(COLLECTION_FORMATS['csv']) }), }; @@ -151,7 +151,7 @@ export class PetApi extends BaseAPI { }), }; - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.tags && { 'tags': requestParameters.tags.join(COLLECTION_FORMATS['csv']) }), }; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts index 2194fdfe9f6..ed3aaa8e371 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts @@ -139,7 +139,7 @@ export class UserApi extends BaseAPI { throwIfRequired(requestParameters, 'username', 'loginUser'); throwIfRequired(requestParameters, 'password', 'loginUser'); - const query: HttpQuery = { + const query: HttpQuery = { ...(requestParameters.username && { 'username': requestParameters.username }), ...(requestParameters.password && { 'password': requestParameters.password }), };