From 2843c444013ba9dc7437ec47cf311437a0112de7 Mon Sep 17 00:00:00 2001 From: Takuro Wada Date: Tue, 14 Jun 2016 21:31:25 +0900 Subject: [PATCH] Handle 204 response correctly in typescirpt-angualr2 --- .../typescript-angular2/api.mustache | 8 +- samples/client/petstore/python/README.md | 2 +- .../default/.swagger-codegen-ignore | 23 ++ .../typescript-angular2/default/LICENSE | 201 ++++++++++++++++++ .../typescript-angular2/default/api/PetApi.ts | 90 ++++++-- .../default/api/StoreApi.ts | 40 +++- .../default/api/UserApi.ts | 88 ++++++-- .../typescript-angular2/default/api/api.ts | 8 +- .../default/model/Category.ts | 2 +- .../default/model/Order.ts | 2 +- .../typescript-angular2/default/model/Pet.ts | 2 +- .../typescript-angular2/default/model/Tag.ts | 2 +- .../typescript-angular2/default/model/User.ts | 2 +- .../default/model/models.ts | 3 - .../npm/.swagger-codegen-ignore | 23 ++ .../petstore/typescript-angular2/npm/LICENSE | 201 ++++++++++++++++++ .../typescript-angular2/npm/README.md | 4 +- .../typescript-angular2/npm/api/PetApi.ts | 90 ++++++-- .../typescript-angular2/npm/api/StoreApi.ts | 40 +++- .../typescript-angular2/npm/api/UserApi.ts | 88 ++++++-- .../typescript-angular2/npm/api/api.ts | 8 +- .../typescript-angular2/npm/model/Category.ts | 2 +- .../typescript-angular2/npm/model/Order.ts | 2 +- .../typescript-angular2/npm/model/Pet.ts | 2 +- .../typescript-angular2/npm/model/Tag.ts | 2 +- .../typescript-angular2/npm/model/User.ts | 2 +- .../typescript-angular2/npm/model/models.ts | 3 - .../typescript-angular2/npm/package.json | 13 +- 28 files changed, 815 insertions(+), 138 deletions(-) create mode 100644 samples/client/petstore/typescript-angular2/default/.swagger-codegen-ignore create mode 100644 samples/client/petstore/typescript-angular2/default/LICENSE create mode 100644 samples/client/petstore/typescript-angular2/npm/.swagger-codegen-ignore create mode 100644 samples/client/petstore/typescript-angular2/npm/LICENSE 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 817afd33f34..48c9ebcea45 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache @@ -80,7 +80,13 @@ export class {{classname}} { {{/hasFormParams}} return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } {{/operation}} diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md index 8fc15c13eec..8c1c938e5e2 100644 --- a/samples/client/petstore/python/README.md +++ b/samples/client/petstore/python/README.md @@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https:// - API version: 1.0.0 - Package version: 1.0.0 -- Build date: 2016-06-09T08:00:02.342+09:00 +- Build date: 2016-06-14T21:15:09.729+09:00 - Build package: class io.swagger.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/samples/client/petstore/typescript-angular2/default/.swagger-codegen-ignore b/samples/client/petstore/typescript-angular2/default/.swagger-codegen-ignore new file mode 100644 index 00000000000..19d3377182e --- /dev/null +++ b/samples/client/petstore/typescript-angular2/default/.swagger-codegen-ignore @@ -0,0 +1,23 @@ +# Swagger Codegen Ignore +# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/typescript-angular2/default/LICENSE b/samples/client/petstore/typescript-angular2/default/LICENSE new file mode 100644 index 00000000000..8dada3edaf5 --- /dev/null +++ b/samples/client/petstore/typescript-angular2/default/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts b/samples/client/petstore/typescript-angular2/default/api/PetApi.ts index a708d49e9f9..9693b85b9d0 100644 --- a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/PetApi.ts @@ -27,7 +27,7 @@ export class PetApi { public addPet (body?: models.Pet, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -37,7 +37,13 @@ export class PetApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -50,7 +56,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'petId' is set if (!petId) { @@ -65,7 +71,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -73,13 +85,13 @@ export class PetApi { * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter */ - public findPetsByStatus (status?: models.Array, extraHttpRequestParams?: any ) : Observable> { + public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : Observable> { const path = this.basePath + '/pet/findByStatus'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (status !== undefined) { - queryParameters['status'] = status; + queryParameters.set('status', status); } let requestOptions: RequestOptionsArgs = { @@ -89,7 +101,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -97,13 +115,13 @@ export class PetApi { * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by */ - public findPetsByTags (tags?: models.Array, extraHttpRequestParams?: any ) : Observable> { + public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : Observable> { const path = this.basePath + '/pet/findByTags'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (tags !== undefined) { - queryParameters['tags'] = tags; + queryParameters.set('tags', tags); } let requestOptions: RequestOptionsArgs = { @@ -113,7 +131,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -125,7 +149,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'petId' is set if (!petId) { @@ -138,7 +162,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -149,7 +179,7 @@ export class PetApi { public updatePet (body?: models.Pet, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'PUT', @@ -159,7 +189,13 @@ export class PetApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -173,7 +209,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); @@ -195,7 +231,13 @@ export class PetApi { requestOptions.body = formParams.toString(); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -205,11 +247,11 @@ export class PetApi { * @param additionalMetadata Additional data to pass to server * @param file file to upload */ - public uploadFile (petId: number, additionalMetadata?: string, file?: models.any, extraHttpRequestParams?: any ) : Observable<{}> { + public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); @@ -231,7 +273,13 @@ export class PetApi { requestOptions.body = formParams.toString(); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts index e6602884a81..78066b05da9 100644 --- a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts @@ -28,7 +28,7 @@ export class StoreApi { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'orderId' is set if (!orderId) { @@ -41,7 +41,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -51,7 +57,7 @@ export class StoreApi { public getInventory (extraHttpRequestParams?: any ) : Observable<{ [key: string]: number; }> { const path = this.basePath + '/store/inventory'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -60,7 +66,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -72,7 +84,7 @@ export class StoreApi { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'orderId' is set if (!orderId) { @@ -85,7 +97,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -96,7 +114,7 @@ export class StoreApi { public placeOrder (body?: models.Order, extraHttpRequestParams?: any ) : Observable { const path = this.basePath + '/store/order'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -106,7 +124,13 @@ export class StoreApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts b/samples/client/petstore/typescript-angular2/default/api/UserApi.ts index 04d2e8155d5..6b8a5f538d9 100644 --- a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts +++ b/samples/client/petstore/typescript-angular2/default/api/UserApi.ts @@ -27,7 +27,7 @@ export class UserApi { public createUser (body?: models.User, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -37,7 +37,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -45,10 +51,10 @@ export class UserApi { * * @param body List of user object */ - public createUsersWithArrayInput (body?: models.Array, extraHttpRequestParams?: any ) : Observable<{}> { + public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/createWithArray'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -58,7 +64,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -66,10 +78,10 @@ export class UserApi { * * @param body List of user object */ - public createUsersWithListInput (body?: models.Array, extraHttpRequestParams?: any ) : Observable<{}> { + public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/createWithList'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -79,7 +91,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -91,7 +109,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -104,7 +122,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -116,7 +140,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -129,7 +153,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -141,14 +171,14 @@ export class UserApi { public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : Observable { const path = this.basePath + '/user/login'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (username !== undefined) { - queryParameters['username'] = username; + queryParameters.set('username', username); } if (password !== undefined) { - queryParameters['password'] = password; + queryParameters.set('password', password); } let requestOptions: RequestOptionsArgs = { @@ -158,7 +188,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -168,7 +204,7 @@ export class UserApi { public logoutUser (extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/logout'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -177,7 +213,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -190,7 +232,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -204,7 +246,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/default/api/api.ts b/samples/client/petstore/typescript-angular2/default/api/api.ts index a7020497be6..056206bfaca 100644 --- a/samples/client/petstore/typescript-angular2/default/api/api.ts +++ b/samples/client/petstore/typescript-angular2/default/api/api.ts @@ -1,5 +1,3 @@ -export * from '../api/PetApi'; -export * from '../api/StoreApi'; -export * from '../api/UserApi'; - - +export * from './PetApi'; +export * from './StoreApi'; +export * from './UserApi'; diff --git a/samples/client/petstore/typescript-angular2/default/model/Category.ts b/samples/client/petstore/typescript-angular2/default/model/Category.ts index 3a9eb603184..e3080b62f97 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Category.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Category.ts @@ -2,9 +2,9 @@ import * as models from './models'; export interface Category { + id?: number; name?: string; } - diff --git a/samples/client/petstore/typescript-angular2/default/model/Order.ts b/samples/client/petstore/typescript-angular2/default/model/Order.ts index ed557b454d4..4507b05bb5b 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Order.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Order.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface Order { + id?: number; @@ -18,7 +19,6 @@ export interface Order { complete?: boolean; } - export namespace Order { export enum StatusEnum { diff --git a/samples/client/petstore/typescript-angular2/default/model/Pet.ts b/samples/client/petstore/typescript-angular2/default/model/Pet.ts index e1235c90052..1fbd617a35e 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Pet.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Pet.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface Pet { + id?: number; @@ -18,7 +19,6 @@ export interface Pet { */ status?: Pet.StatusEnum; } - export namespace Pet { export enum StatusEnum { diff --git a/samples/client/petstore/typescript-angular2/default/model/Tag.ts b/samples/client/petstore/typescript-angular2/default/model/Tag.ts index fba08175c1e..489e7b5d51a 100644 --- a/samples/client/petstore/typescript-angular2/default/model/Tag.ts +++ b/samples/client/petstore/typescript-angular2/default/model/Tag.ts @@ -2,9 +2,9 @@ import * as models from './models'; export interface Tag { + id?: number; name?: string; } - diff --git a/samples/client/petstore/typescript-angular2/default/model/User.ts b/samples/client/petstore/typescript-angular2/default/model/User.ts index 3f14a356307..40711a0f677 100644 --- a/samples/client/petstore/typescript-angular2/default/model/User.ts +++ b/samples/client/petstore/typescript-angular2/default/model/User.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface User { + id?: number; @@ -22,4 +23,3 @@ export interface User { */ userStatus?: number; } - diff --git a/samples/client/petstore/typescript-angular2/default/model/models.ts b/samples/client/petstore/typescript-angular2/default/model/models.ts index cd7700a649e..92dac02846c 100644 --- a/samples/client/petstore/typescript-angular2/default/model/models.ts +++ b/samples/client/petstore/typescript-angular2/default/model/models.ts @@ -3,6 +3,3 @@ export * from './Order'; export * from './Pet'; export * from './Tag'; export * from './User'; - - - diff --git a/samples/client/petstore/typescript-angular2/npm/.swagger-codegen-ignore b/samples/client/petstore/typescript-angular2/npm/.swagger-codegen-ignore new file mode 100644 index 00000000000..19d3377182e --- /dev/null +++ b/samples/client/petstore/typescript-angular2/npm/.swagger-codegen-ignore @@ -0,0 +1,23 @@ +# Swagger Codegen Ignore +# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/typescript-angular2/npm/LICENSE b/samples/client/petstore/typescript-angular2/npm/LICENSE new file mode 100644 index 00000000000..8dada3edaf5 --- /dev/null +++ b/samples/client/petstore/typescript-angular2/npm/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/samples/client/petstore/typescript-angular2/npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md index 0fdbf4a4ded..965ce77c731 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.201605120027 +## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201606142120 ### 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.201605120027 --save +npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201606142120 --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 a708d49e9f9..9693b85b9d0 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts @@ -27,7 +27,7 @@ export class PetApi { public addPet (body?: models.Pet, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -37,7 +37,13 @@ export class PetApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -50,7 +56,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'petId' is set if (!petId) { @@ -65,7 +71,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -73,13 +85,13 @@ export class PetApi { * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter */ - public findPetsByStatus (status?: models.Array, extraHttpRequestParams?: any ) : Observable> { + public findPetsByStatus (status?: Array, extraHttpRequestParams?: any ) : Observable> { const path = this.basePath + '/pet/findByStatus'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (status !== undefined) { - queryParameters['status'] = status; + queryParameters.set('status', status); } let requestOptions: RequestOptionsArgs = { @@ -89,7 +101,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -97,13 +115,13 @@ export class PetApi { * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by */ - public findPetsByTags (tags?: models.Array, extraHttpRequestParams?: any ) : Observable> { + public findPetsByTags (tags?: Array, extraHttpRequestParams?: any ) : Observable> { const path = this.basePath + '/pet/findByTags'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (tags !== undefined) { - queryParameters['tags'] = tags; + queryParameters.set('tags', tags); } let requestOptions: RequestOptionsArgs = { @@ -113,7 +131,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -125,7 +149,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'petId' is set if (!petId) { @@ -138,7 +162,13 @@ export class PetApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -149,7 +179,7 @@ export class PetApi { public updatePet (body?: models.Pet, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'PUT', @@ -159,7 +189,13 @@ export class PetApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -173,7 +209,7 @@ export class PetApi { const path = this.basePath + '/pet/{petId}' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); @@ -195,7 +231,13 @@ export class PetApi { requestOptions.body = formParams.toString(); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -205,11 +247,11 @@ export class PetApi { * @param additionalMetadata Additional data to pass to server * @param file file to upload */ - public uploadFile (petId: number, additionalMetadata?: string, file?: models.any, extraHttpRequestParams?: any ) : Observable<{}> { + public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/pet/{petId}/uploadImage' .replace('{' + 'petId' + '}', String(petId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let formParams = new URLSearchParams(); @@ -231,7 +273,13 @@ export class PetApi { requestOptions.body = formParams.toString(); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts index e6602884a81..78066b05da9 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts @@ -28,7 +28,7 @@ export class StoreApi { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'orderId' is set if (!orderId) { @@ -41,7 +41,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -51,7 +57,7 @@ export class StoreApi { public getInventory (extraHttpRequestParams?: any ) : Observable<{ [key: string]: number; }> { const path = this.basePath + '/store/inventory'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -60,7 +66,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -72,7 +84,7 @@ export class StoreApi { const path = this.basePath + '/store/order/{orderId}' .replace('{' + 'orderId' + '}', String(orderId)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'orderId' is set if (!orderId) { @@ -85,7 +97,13 @@ export class StoreApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -96,7 +114,7 @@ export class StoreApi { public placeOrder (body?: models.Order, extraHttpRequestParams?: any ) : Observable { const path = this.basePath + '/store/order'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -106,7 +124,13 @@ export class StoreApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts b/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts index 04d2e8155d5..6b8a5f538d9 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts @@ -27,7 +27,7 @@ export class UserApi { public createUser (body?: models.User, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -37,7 +37,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -45,10 +51,10 @@ export class UserApi { * * @param body List of user object */ - public createUsersWithArrayInput (body?: models.Array, extraHttpRequestParams?: any ) : Observable<{}> { + public createUsersWithArrayInput (body?: Array, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/createWithArray'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -58,7 +64,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -66,10 +78,10 @@ export class UserApi { * * @param body List of user object */ - public createUsersWithListInput (body?: models.Array, extraHttpRequestParams?: any ) : Observable<{}> { + public createUsersWithListInput (body?: Array, extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/createWithList'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'POST', @@ -79,7 +91,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -91,7 +109,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -104,7 +122,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -116,7 +140,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -129,7 +153,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -141,14 +171,14 @@ export class UserApi { public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : Observable { const path = this.basePath + '/user/login'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; if (username !== undefined) { - queryParameters['username'] = username; + queryParameters.set('username', username); } if (password !== undefined) { - queryParameters['password'] = password; + queryParameters.set('password', password); } let requestOptions: RequestOptionsArgs = { @@ -158,7 +188,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -168,7 +204,7 @@ export class UserApi { public logoutUser (extraHttpRequestParams?: any ) : Observable<{}> { const path = this.basePath + '/user/logout'; - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; let requestOptions: RequestOptionsArgs = { method: 'GET', @@ -177,7 +213,13 @@ export class UserApi { }; return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } /** @@ -190,7 +232,7 @@ export class UserApi { const path = this.basePath + '/user/{username}' .replace('{' + 'username' + '}', String(username)); - let queryParameters: any = ""; // This should probably be an object in the future + let queryParameters = new URLSearchParams(); let headerParams = this.defaultHeaders; // verify required parameter 'username' is set if (!username) { @@ -204,7 +246,13 @@ export class UserApi { requestOptions.body = JSON.stringify(body); return this.http.request(path, requestOptions) - .map((response: Response) => response.json()); + .map((response: Response) => { + if (response.status === 204) { + return undefined; + } else { + return response.json(); + } + }); } } diff --git a/samples/client/petstore/typescript-angular2/npm/api/api.ts b/samples/client/petstore/typescript-angular2/npm/api/api.ts index a7020497be6..056206bfaca 100644 --- a/samples/client/petstore/typescript-angular2/npm/api/api.ts +++ b/samples/client/petstore/typescript-angular2/npm/api/api.ts @@ -1,5 +1,3 @@ -export * from '../api/PetApi'; -export * from '../api/StoreApi'; -export * from '../api/UserApi'; - - +export * from './PetApi'; +export * from './StoreApi'; +export * from './UserApi'; diff --git a/samples/client/petstore/typescript-angular2/npm/model/Category.ts b/samples/client/petstore/typescript-angular2/npm/model/Category.ts index 3a9eb603184..e3080b62f97 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Category.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Category.ts @@ -2,9 +2,9 @@ import * as models from './models'; export interface Category { + id?: number; name?: string; } - diff --git a/samples/client/petstore/typescript-angular2/npm/model/Order.ts b/samples/client/petstore/typescript-angular2/npm/model/Order.ts index ed557b454d4..4507b05bb5b 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Order.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Order.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface Order { + id?: number; @@ -18,7 +19,6 @@ export interface Order { complete?: boolean; } - export namespace Order { export enum StatusEnum { diff --git a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts b/samples/client/petstore/typescript-angular2/npm/model/Pet.ts index e1235c90052..1fbd617a35e 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Pet.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface Pet { + id?: number; @@ -18,7 +19,6 @@ export interface Pet { */ status?: Pet.StatusEnum; } - export namespace Pet { export enum StatusEnum { diff --git a/samples/client/petstore/typescript-angular2/npm/model/Tag.ts b/samples/client/petstore/typescript-angular2/npm/model/Tag.ts index fba08175c1e..489e7b5d51a 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/Tag.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/Tag.ts @@ -2,9 +2,9 @@ import * as models from './models'; export interface Tag { + id?: number; name?: string; } - diff --git a/samples/client/petstore/typescript-angular2/npm/model/User.ts b/samples/client/petstore/typescript-angular2/npm/model/User.ts index 3f14a356307..40711a0f677 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/User.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/User.ts @@ -2,6 +2,7 @@ import * as models from './models'; export interface User { + id?: number; @@ -22,4 +23,3 @@ export interface User { */ userStatus?: number; } - diff --git a/samples/client/petstore/typescript-angular2/npm/model/models.ts b/samples/client/petstore/typescript-angular2/npm/model/models.ts index cd7700a649e..92dac02846c 100644 --- a/samples/client/petstore/typescript-angular2/npm/model/models.ts +++ b/samples/client/petstore/typescript-angular2/npm/model/models.ts @@ -3,6 +3,3 @@ export * from './Order'; export * from './Pet'; export * from './Tag'; export * from './User'; - - - diff --git a/samples/client/petstore/typescript-angular2/npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json index 8447881dafc..74c2dcc55a3 100644 --- a/samples/client/petstore/typescript-angular2/npm/package.json +++ b/samples/client/petstore/typescript-angular2/npm/package.json @@ -1,12 +1,12 @@ { "name": "@swagger/angular2-typescript-petstore", - "version": "0.0.1-SNAPSHOT.201605120027", + "version": "0.0.1-SNAPSHOT.201606142120", "description": "swagger client for @swagger/angular2-typescript-petstore", "author": "Swagger Codegen Contributors", "keywords": [ "swagger-client" ], - "license": "MIT", + "license": "Apache-2.0", "files": [ "lib" ], @@ -16,15 +16,8 @@ "build": "typings install && tsc" }, "peerDependencies": { - "@angular/common": "^2.0.0-rc.1", - "@angular/compiler": "^2.0.0-rc.1", "@angular/core": "^2.0.0-rc.1", - "@angular/http": "^2.0.0-rc.1", - "@angular/platform-browser": "^2.0.0-rc.1", - "@angular/platform-browser-dynamic": "^2.0.0-rc.1", - "core-js": "^2.3.0", - "rxjs": "^5.0.0-beta.6", - "zone.js": "^0.6.12" + "@angular/http": "^2.0.0-rc.1" }, "devDependencies": { "@angular/common": "^2.0.0-rc.1",