From 80aae96b733310076c61f6582f374bbc7aae092b Mon Sep 17 00:00:00 2001 From: Esteban Gehring Date: Tue, 15 Oct 2019 13:36:52 +0200 Subject: [PATCH 1/2] #4159: fix typescript-rxjs query parameter type --- .../src/main/resources/typescript-rxjs/apis.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3c548d7b547d..0c70dc5e6ca9 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}} From bf07484c1a864eed7fd0e963f9c3f435c328473b Mon Sep 17 00:00:00 2001 From: Esteban Gehring Date: Tue, 15 Oct 2019 13:40:40 +0200 Subject: [PATCH 2/2] re-generate typescript-rxjs samples --- .../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 +- 8 files changed, 12 insertions(+), 12 deletions(-) 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 a5328a8c7285..16c0d116369e 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 2194fdfe9f68..ed3aaa8e371a 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 a5328a8c7285..16c0d116369e 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 2194fdfe9f68..ed3aaa8e371a 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 a5328a8c7285..16c0d116369e 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 2194fdfe9f68..ed3aaa8e371a 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 a5328a8c7285..16c0d116369e 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 2194fdfe9f68..ed3aaa8e371a 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 }), };