From ecddf94c8dd177eaf6f0adf14850784f108f6923 Mon Sep 17 00:00:00 2001 From: daviddodsworth Date: Thu, 30 Jun 2016 14:15:29 -0400 Subject: [PATCH] Issue #3262 [ASPNET5] Server Bug - doesn't properly serialize JSON properties in camelCase Adding suggested fix of [JsonProperty (PropertyName = "{{baseName}}")] --- .../src/main/resources/aspnet5/model.mustache | 3 +- .../petstore/aspnet5/.swagger-codegen-ignore | 23 ++ samples/server/petstore/aspnet5/LICENSE | 201 ++++++++++++++++++ .../src/IO.Swagger/Models/ApiResponse.cs | 3 + .../aspnet5/src/IO.Swagger/Models/Category.cs | 2 + .../aspnet5/src/IO.Swagger/Models/Order.cs | 6 + .../aspnet5/src/IO.Swagger/Models/Pet.cs | 6 + .../aspnet5/src/IO.Swagger/Models/Tag.cs | 2 + .../aspnet5/src/IO.Swagger/Models/User.cs | 8 + 9 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 samples/server/petstore/aspnet5/.swagger-codegen-ignore create mode 100644 samples/server/petstore/aspnet5/LICENSE diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache index 08aaed01f3d..ebfbef9347c 100644 --- a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache +++ b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache @@ -51,6 +51,7 @@ namespace {{packageName}}.Models /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} /// {{#description}} /// {{{description}}}{{/description}} + [JsonProperty(PropertyName = "{{baseName}}")] public {{{datatype}}} {{name}} { get; set; } {{/vars}} @@ -64,7 +65,7 @@ namespace {{packageName}}.Models var sb = new StringBuilder(); sb.Append("class {{classname}} {\n"); {{#vars}}sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); - {{/vars}} + {{/vars}} sb.Append("}\n"); return sb.ToString(); } diff --git a/samples/server/petstore/aspnet5/.swagger-codegen-ignore b/samples/server/petstore/aspnet5/.swagger-codegen-ignore new file mode 100644 index 00000000000..c5fa491b4c5 --- /dev/null +++ b/samples/server/petstore/aspnet5/.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 +# This 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/server/petstore/aspnet5/LICENSE b/samples/server/petstore/aspnet5/LICENSE new file mode 100644 index 00000000000..8dada3edaf5 --- /dev/null +++ b/samples/server/petstore/aspnet5/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/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs index 886f22c21bf..7514bf05514 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs @@ -32,16 +32,19 @@ public ApiResponse(int? Code = null, string Type = null, string Message = null) /// /// Gets or Sets Code /// + [JsonProperty(PropertyName = "code")] public int? Code { get; set; } /// /// Gets or Sets Type /// + [JsonProperty(PropertyName = "type")] public string Type { get; set; } /// /// Gets or Sets Message /// + [JsonProperty(PropertyName = "message")] public string Message { get; set; } diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs index e412db81ee2..214b0223dfd 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs @@ -30,11 +30,13 @@ public Category(long? Id = null, string Name = null) /// /// Gets or Sets Id /// + [JsonProperty(PropertyName = "id")] public long? Id { get; set; } /// /// Gets or Sets Name /// + [JsonProperty(PropertyName = "name")] public string Name { get; set; } diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs index 5b5a9b6d14e..4d73d64b500 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs @@ -46,32 +46,38 @@ public Order(long? Id = null, long? PetId = null, int? Quantity = null, DateTime /// /// Gets or Sets Id /// + [JsonProperty(PropertyName = "id")] public long? Id { get; set; } /// /// Gets or Sets PetId /// + [JsonProperty(PropertyName = "petId")] public long? PetId { get; set; } /// /// Gets or Sets Quantity /// + [JsonProperty(PropertyName = "quantity")] public int? Quantity { get; set; } /// /// Gets or Sets ShipDate /// + [JsonProperty(PropertyName = "shipDate")] public DateTime? ShipDate { get; set; } /// /// Order Status /// /// Order Status + [JsonProperty(PropertyName = "status")] public string Status { get; set; } /// /// Gets or Sets Complete /// + [JsonProperty(PropertyName = "complete")] public bool? Complete { get; set; } diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs index 70a3992c294..4a979cf74eb 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs @@ -54,32 +54,38 @@ public Pet(long? Id = null, Category Category = null, string Name = null, List /// Gets or Sets Id /// + [JsonProperty(PropertyName = "id")] public long? Id { get; set; } /// /// Gets or Sets Category /// + [JsonProperty(PropertyName = "category")] public Category Category { get; set; } /// /// Gets or Sets Name /// + [JsonProperty(PropertyName = "name")] public string Name { get; set; } /// /// Gets or Sets PhotoUrls /// + [JsonProperty(PropertyName = "photoUrls")] public List PhotoUrls { get; set; } /// /// Gets or Sets Tags /// + [JsonProperty(PropertyName = "tags")] public List Tags { get; set; } /// /// pet status in the store /// /// pet status in the store + [JsonProperty(PropertyName = "status")] public string Status { get; set; } diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs index 77697097379..99488b7d0c7 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs @@ -30,11 +30,13 @@ public Tag(long? Id = null, string Name = null) /// /// Gets or Sets Id /// + [JsonProperty(PropertyName = "id")] public long? Id { get; set; } /// /// Gets or Sets Name /// + [JsonProperty(PropertyName = "name")] public string Name { get; set; } diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs index c8373712db9..454ed556d79 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs @@ -42,42 +42,50 @@ public User(long? Id = null, string Username = null, string FirstName = null, st /// /// Gets or Sets Id /// + [JsonProperty(PropertyName = "id")] public long? Id { get; set; } /// /// Gets or Sets Username /// + [JsonProperty(PropertyName = "username")] public string Username { get; set; } /// /// Gets or Sets FirstName /// + [JsonProperty(PropertyName = "firstName")] public string FirstName { get; set; } /// /// Gets or Sets LastName /// + [JsonProperty(PropertyName = "lastName")] public string LastName { get; set; } /// /// Gets or Sets Email /// + [JsonProperty(PropertyName = "email")] public string Email { get; set; } /// /// Gets or Sets Password /// + [JsonProperty(PropertyName = "password")] public string Password { get; set; } /// /// Gets or Sets Phone /// + [JsonProperty(PropertyName = "phone")] public string Phone { get; set; } /// /// User Status /// /// User Status + [JsonProperty(PropertyName = "userStatus")] public int? UserStatus { get; set; }