From adc445a5ff6910c97696022276487aab35844640 Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Sun, 7 Aug 2016 09:14:07 -0400 Subject: [PATCH] [aspnet] Honor casing of properties from definition --- .../src/main/resources/aspnet5/model.mustache | 5 +++- .../main/resources/csharp/modelEnum.mustache | 2 +- samples/server/petstore/aspnet5/README.md | 26 ++++++++++++++++--- .../aspnet5/src/IO.Swagger/Dockerfile | 4 --- .../src/IO.Swagger/Models/ApiResponse.cs | 8 ++++-- .../aspnet5/src/IO.Swagger/Models/Category.cs | 5 +++- .../aspnet5/src/IO.Swagger/Models/Order.cs | 17 ++++++++---- .../aspnet5/src/IO.Swagger/Models/Pet.cs | 17 ++++++++---- .../aspnet5/src/IO.Swagger/Models/Tag.cs | 5 +++- .../aspnet5/src/IO.Swagger/Models/User.cs | 23 +++++++++++----- 10 files changed, 81 insertions(+), 31 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache index 5af9183b1dc..58325e8fe24 100644 --- a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache +++ b/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache @@ -16,6 +16,7 @@ namespace {{packageName}}.Models /// /// {{description}} /// + [DataContract] public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> { /// @@ -52,6 +53,7 @@ namespace {{packageName}}.Models /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} /// {{#description}} /// {{{description}}}{{/description}} + [DataMember(Name="{{baseName}}")] public {{{datatype}}} {{name}} { get; set; } {{/vars}} @@ -64,7 +66,8 @@ namespace {{packageName}}.Models { var sb = new StringBuilder(); sb.Append("class {{classname}} {\n"); - {{#vars}}sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); + {{#vars}} + sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); {{/vars}} sb.Append("}\n"); return sb.ToString(); diff --git a/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache index ff38385c785..ff007904f46 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/modelEnum.mustache @@ -1,5 +1,5 @@ /// - /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} + /// {{^description}}Defines {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} /// {{#description}} /// {{{description}}}{{/description}} [JsonConverter(typeof(StringEnumConverter))] diff --git a/samples/server/petstore/aspnet5/README.md b/samples/server/petstore/aspnet5/README.md index 2bdca9e4d48..3ed276e77b1 100644 --- a/samples/server/petstore/aspnet5/README.md +++ b/samples/server/petstore/aspnet5/README.md @@ -1,7 +1,25 @@ -# {{packageName}} - ASP.NET Core 1.0 Server +# IO.Swagger - ASP.NET Core 1.0 Server -{{#appDescription}} -{{{appDescription}}} -{{/appDescription}} +This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters. +## Run +Linux/OS X: + +``` +sh build.sh +``` + +Windows: + +``` +build.bat +``` + +## Run in Docker + +``` +cd src/IO.Swagger +docker build -t IO.Swagger . +docker run -p 5000:5000 IO.Swagger +``` diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile b/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile index 5a44639a7b0..f4abe48a5cb 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile @@ -1,7 +1,5 @@ FROM microsoft/dotnet:latest -RUN groupadd -r app && useradd -r -g app app - ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 RUN mkdir -p /app/IO.Swagger @@ -10,7 +8,5 @@ WORKDIR /app/IO.Swagger EXPOSE 5000/tcp -USER app - RUN ["dotnet", "restore"] ENTRYPOINT ["dotnet", "run", "-p", "project.json", "web"] 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 cdde768afcc..e34c3edf374 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class ApiResponse : IEquatable { /// @@ -54,16 +55,19 @@ namespace IO.Swagger.Models /// /// Gets or Sets Code /// + [DataMember(Name="code")] public int? Code { get; set; } /// /// Gets or Sets Type /// + [DataMember(Name="type")] public string Type { get; set; } /// /// Gets or Sets Message /// + [DataMember(Name="message")] public string Message { get; set; } @@ -76,8 +80,8 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class ApiResponse {\n"); sb.Append(" Code: ").Append(Code).Append("\n"); -sb.Append(" Type: ").Append(Type).Append("\n"); -sb.Append(" Message: ").Append(Message).Append("\n"); + sb.Append(" Type: ").Append(Type).Append("\n"); + sb.Append(" Message: ").Append(Message).Append("\n"); sb.Append("}\n"); return sb.ToString(); } 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 410079fb6bf..15f10eb9aa7 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class Category : IEquatable { /// @@ -52,11 +53,13 @@ namespace IO.Swagger.Models /// /// Gets or Sets Id /// + [DataMember(Name="id")] public long? Id { get; set; } /// /// Gets or Sets Name /// + [DataMember(Name="name")] public string Name { get; set; } @@ -69,7 +72,7 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class Category {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); -sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append("}\n"); return sb.ToString(); } 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 357eed81bd1..a49276583c6 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class Order : IEquatable { /// @@ -68,32 +69,38 @@ namespace IO.Swagger.Models /// /// Gets or Sets Id /// + [DataMember(Name="id")] public long? Id { get; set; } /// /// Gets or Sets PetId /// + [DataMember(Name="petId")] public long? PetId { get; set; } /// /// Gets or Sets Quantity /// + [DataMember(Name="quantity")] public int? Quantity { get; set; } /// /// Gets or Sets ShipDate /// + [DataMember(Name="shipDate")] public DateTime? ShipDate { get; set; } /// /// Order Status /// /// Order Status + [DataMember(Name="status")] public string Status { get; set; } /// /// Gets or Sets Complete /// + [DataMember(Name="complete")] public bool? Complete { get; set; } @@ -106,11 +113,11 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class Order {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); -sb.Append(" PetId: ").Append(PetId).Append("\n"); -sb.Append(" Quantity: ").Append(Quantity).Append("\n"); -sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); -sb.Append(" Status: ").Append(Status).Append("\n"); -sb.Append(" Complete: ").Append(Complete).Append("\n"); + sb.Append(" PetId: ").Append(PetId).Append("\n"); + sb.Append(" Quantity: ").Append(Quantity).Append("\n"); + sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append(" Complete: ").Append(Complete).Append("\n"); sb.Append("}\n"); return sb.ToString(); } 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 ff8bec1056f..6c4afd3b95e 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class Pet : IEquatable { /// @@ -76,32 +77,38 @@ namespace IO.Swagger.Models /// /// Gets or Sets Id /// + [DataMember(Name="id")] public long? Id { get; set; } /// /// Gets or Sets Category /// + [DataMember(Name="category")] public Category Category { get; set; } /// /// Gets or Sets Name /// + [DataMember(Name="name")] public string Name { get; set; } /// /// Gets or Sets PhotoUrls /// + [DataMember(Name="photoUrls")] public List PhotoUrls { get; set; } /// /// Gets or Sets Tags /// + [DataMember(Name="tags")] public List Tags { get; set; } /// /// pet status in the store /// /// pet status in the store + [DataMember(Name="status")] public string Status { get; set; } @@ -114,11 +121,11 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class Pet {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); -sb.Append(" Category: ").Append(Category).Append("\n"); -sb.Append(" Name: ").Append(Name).Append("\n"); -sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); -sb.Append(" Tags: ").Append(Tags).Append("\n"); -sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append(" Category: ").Append(Category).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); + sb.Append(" Tags: ").Append(Tags).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); sb.Append("}\n"); return sb.ToString(); } 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 4520f8af533..4f2cc3e5cef 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class Tag : IEquatable { /// @@ -52,11 +53,13 @@ namespace IO.Swagger.Models /// /// Gets or Sets Id /// + [DataMember(Name="id")] public long? Id { get; set; } /// /// Gets or Sets Name /// + [DataMember(Name="name")] public string Name { get; set; } @@ -69,7 +72,7 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class Tag {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); -sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); sb.Append("}\n"); return sb.ToString(); } 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 620f1c69f21..8933e370956 100644 --- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs +++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs @@ -35,6 +35,7 @@ namespace IO.Swagger.Models /// /// /// + [DataContract] public partial class User : IEquatable { /// @@ -64,42 +65,50 @@ namespace IO.Swagger.Models /// /// Gets or Sets Id /// + [DataMember(Name="id")] public long? Id { get; set; } /// /// Gets or Sets Username /// + [DataMember(Name="username")] public string Username { get; set; } /// /// Gets or Sets FirstName /// + [DataMember(Name="firstName")] public string FirstName { get; set; } /// /// Gets or Sets LastName /// + [DataMember(Name="lastName")] public string LastName { get; set; } /// /// Gets or Sets Email /// + [DataMember(Name="email")] public string Email { get; set; } /// /// Gets or Sets Password /// + [DataMember(Name="password")] public string Password { get; set; } /// /// Gets or Sets Phone /// + [DataMember(Name="phone")] public string Phone { get; set; } /// /// User Status /// /// User Status + [DataMember(Name="userStatus")] public int? UserStatus { get; set; } @@ -112,13 +121,13 @@ namespace IO.Swagger.Models var sb = new StringBuilder(); sb.Append("class User {\n"); sb.Append(" Id: ").Append(Id).Append("\n"); -sb.Append(" Username: ").Append(Username).Append("\n"); -sb.Append(" FirstName: ").Append(FirstName).Append("\n"); -sb.Append(" LastName: ").Append(LastName).Append("\n"); -sb.Append(" Email: ").Append(Email).Append("\n"); -sb.Append(" Password: ").Append(Password).Append("\n"); -sb.Append(" Phone: ").Append(Phone).Append("\n"); -sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); + sb.Append(" Username: ").Append(Username).Append("\n"); + sb.Append(" FirstName: ").Append(FirstName).Append("\n"); + sb.Append(" LastName: ").Append(LastName).Append("\n"); + sb.Append(" Email: ").Append(Email).Append("\n"); + sb.Append(" Password: ").Append(Password).Append("\n"); + sb.Append(" Phone: ").Append(Phone).Append("\n"); + sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); sb.Append("}\n"); return sb.ToString(); }