diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 0893c5102dd..d02bc60539a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -87,4 +87,8 @@ public class CodegenConstants { public static final String MODEL_NAME_SUFFIX = "modelNameSuffix"; public static final String MODEL_NAME_SUFFIX_DESC = "Suffix that will be appended to all model names. Default is the empty string."; + + public static final String OPTIONAL_EMIT_DEFAULT_VALUES = "optionalEmitDefaultValues"; + public static final String OPTIONAL_EMIT_DEFAULT_VALUES_DESC = "Set DataMember's EmitDefaultValue, default false."; + } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java index 98284764793..dc65edeb874 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java @@ -13,6 +13,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co protected boolean optionalAssemblyInfoFlag = true; protected boolean optionalProjectFileFlag = false; + protected boolean optionalEmitDefaultValue = false; protected boolean optionalMethodArgumentFlag = true; protected boolean useDateTimeOffsetFlag = false; protected boolean useCollection = false; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index 4cc027bb63f..cf07c68f826 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -121,6 +121,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { addSwitch(CodegenConstants.OPTIONAL_PROJECT_FILE, CodegenConstants.OPTIONAL_PROJECT_FILE_DESC, this.optionalProjectFileFlag); + + addSwitch(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, + CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES_DESC, + this.optionalEmitDefaultValue); } @Override @@ -139,6 +143,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { additionalProperties.put("packageDescription", packageDescription); additionalProperties.put("packageCompany", packageCompany); additionalProperties.put("packageCopyright", packageCopyright); + additionalProperties.put("emitDefaultValue", optionalEmitDefaultValue); if (additionalProperties.containsKey(CodegenConstants.DOTNET_FRAMEWORK)) { setTargetFramework((String) additionalProperties.get(CodegenConstants.DOTNET_FRAMEWORK)); diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache index 7dc1bd83563..86589816d12 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache @@ -28,7 +28,7 @@ namespace {{packageName}}.Model /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} /// {{#description}} /// {{{description}}}{{/description}} - [DataMember(Name="{{baseName}}", EmitDefaultValue=true)] + [DataMember(Name="{{baseName}}", EmitDefaultValue={{emitDefaultValue}})] public {{{datatypeWithEnum}}} {{name}} { get; set; } {{/isEnum}}{{/vars}} /// @@ -66,7 +66,7 @@ namespace {{packageName}}.Model /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} /// {{#description}} /// {{{description}}}{{/description}} - [DataMember(Name="{{baseName}}", EmitDefaultValue=true)] + [DataMember(Name="{{baseName}}", EmitDefaultValue={{emitDefaultValue}})] public {{{datatype}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; } {{/isEnum}}{{/vars}} /// diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java index ce810faea8b..e8366aca008 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java @@ -32,6 +32,7 @@ public class CSharpClientOptionsProvider implements OptionsProvider { .put(CodegenConstants.OPTIONAL_PROJECT_FILE, "true") .put(CodegenConstants.OPTIONAL_PROJECT_GUID, PACKAGE_GUID_VALUE) .put(CodegenConstants.DOTNET_FRAMEWORK, "4.x") + .put(CodegenConstants.OPTIONAL_EMIT_DEFAULT_VALUES, "false") .build(); } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs index 41efd2c08df..6384ee4179b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CategoryTests.cs @@ -9,8 +9,6 @@ using IO.Swagger.Model; using IO.Swagger.Client; using System.Reflection; - - namespace IO.Swagger.Test { [TestFixture] @@ -68,5 +66,3 @@ namespace IO.Swagger.Test } } - - diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs index be753c8dabc..7d0bc854cef 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/OrderTests.cs @@ -9,8 +9,6 @@ using IO.Swagger.Model; using IO.Swagger.Client; using System.Reflection; - - namespace IO.Swagger.Test { [TestFixture] @@ -104,5 +102,3 @@ namespace IO.Swagger.Test } } - - diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs index b5ce94521ac..7e3566eb04b 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs @@ -11,7 +11,6 @@ using IO.Swagger.Client; using IO.Swagger.Api; using IO.Swagger.Model; - namespace IO.Swagger.Test { [TestFixture] diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs index ea618777058..6b203dbd125 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetTests.cs @@ -9,8 +9,6 @@ using IO.Swagger.Model; using IO.Swagger.Client; using System.Reflection; - - namespace IO.Swagger.Test { [TestFixture] @@ -104,5 +102,3 @@ namespace IO.Swagger.Test } } - - diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs index 6b35eb1a6b3..b0eb6293380 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs @@ -11,7 +11,6 @@ using IO.Swagger.Client; using IO.Swagger.Api; using IO.Swagger.Model; - namespace IO.Swagger.Test { [TestFixture] diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs index 2348c02e789..ad772584cc5 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/TagTests.cs @@ -9,8 +9,6 @@ using IO.Swagger.Model; using IO.Swagger.Client; using System.Reflection; - - namespace IO.Swagger.Test { [TestFixture] @@ -68,5 +66,3 @@ namespace IO.Swagger.Test } } - - diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs index e1467147e71..0d543c384aa 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs @@ -11,7 +11,6 @@ using IO.Swagger.Client; using IO.Swagger.Api; using IO.Swagger.Model; - namespace IO.Swagger.Test { [TestFixture] diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs index 473f74cb095..4610313b734 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserTests.cs @@ -9,8 +9,6 @@ using IO.Swagger.Model; using IO.Swagger.Client; using System.Reflection; - - namespace IO.Swagger.Test { [TestFixture] @@ -122,5 +120,3 @@ namespace IO.Swagger.Test } } - - diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs index 4d56e4c1948..9ce0941740e 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs @@ -7,7 +7,6 @@ using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; - namespace IO.Swagger.Api { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs index 6c0134af16c..ca6fa9529d1 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs @@ -7,7 +7,6 @@ using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; - namespace IO.Swagger.Api { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs index ee8c375dc1f..193cc501a85 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs @@ -7,7 +7,6 @@ using RestSharp; using IO.Swagger.Client; using IO.Swagger.Model; - namespace IO.Swagger.Api { diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs index 5af4256119e..80683074e9f 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs @@ -9,8 +9,6 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; - - namespace IO.Swagger.Model { /// @@ -38,13 +36,13 @@ namespace IO.Swagger.Model /// /// Gets or Sets Id /// - [DataMember(Name="id", EmitDefaultValue=true)] + [DataMember(Name="id", EmitDefaultValue=false)] public long? Id { get; set; } /// /// Gets or Sets Name /// - [DataMember(Name="name", EmitDefaultValue=true)] + [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } /// @@ -129,6 +127,4 @@ namespace IO.Swagger.Model } } - - } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs index a22e5e51dcd..4fc561c6786 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs @@ -9,8 +9,6 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; - - namespace IO.Swagger.Model { /// @@ -37,7 +35,7 @@ namespace IO.Swagger.Model /// Order Status /// /// Order Status - [DataMember(Name="status", EmitDefaultValue=true)] + [DataMember(Name="status", EmitDefaultValue=false)] public StatusEnum? Status { get; set; } /// @@ -64,31 +62,31 @@ namespace IO.Swagger.Model /// /// Gets or Sets Id /// - [DataMember(Name="id", EmitDefaultValue=true)] + [DataMember(Name="id", EmitDefaultValue=false)] public long? Id { get; private set; } /// /// Gets or Sets PetId /// - [DataMember(Name="petId", EmitDefaultValue=true)] + [DataMember(Name="petId", EmitDefaultValue=false)] public long? PetId { get; set; } /// /// Gets or Sets Quantity /// - [DataMember(Name="quantity", EmitDefaultValue=true)] + [DataMember(Name="quantity", EmitDefaultValue=false)] public int? Quantity { get; set; } /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=true)] + [DataMember(Name="shipDate", EmitDefaultValue=false)] public DateTime? ShipDate { get; set; } /// /// Gets or Sets Complete /// - [DataMember(Name="complete", EmitDefaultValue=true)] + [DataMember(Name="complete", EmitDefaultValue=false)] public bool? Complete { get; set; } /// @@ -209,6 +207,4 @@ namespace IO.Swagger.Model } } - - } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs index bf38e422f4e..b206c3fa550 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs @@ -9,8 +9,6 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; - - namespace IO.Swagger.Model { /// @@ -37,7 +35,7 @@ namespace IO.Swagger.Model /// pet status in the store /// /// pet status in the store - [DataMember(Name="status", EmitDefaultValue=true)] + [DataMember(Name="status", EmitDefaultValue=false)] public StatusEnum? Status { get; set; } /// @@ -82,31 +80,31 @@ namespace IO.Swagger.Model /// /// Gets or Sets Id /// - [DataMember(Name="id", EmitDefaultValue=true)] + [DataMember(Name="id", EmitDefaultValue=false)] public long? Id { get; set; } /// /// Gets or Sets Category /// - [DataMember(Name="category", EmitDefaultValue=true)] + [DataMember(Name="category", EmitDefaultValue=false)] public Category Category { get; set; } /// /// Gets or Sets Name /// - [DataMember(Name="name", EmitDefaultValue=true)] + [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } /// /// Gets or Sets PhotoUrls /// - [DataMember(Name="photoUrls", EmitDefaultValue=true)] + [DataMember(Name="photoUrls", EmitDefaultValue=false)] public List PhotoUrls { get; set; } /// /// Gets or Sets Tags /// - [DataMember(Name="tags", EmitDefaultValue=true)] + [DataMember(Name="tags", EmitDefaultValue=false)] public List Tags { get; set; } /// @@ -227,6 +225,4 @@ namespace IO.Swagger.Model } } - - } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs index d756b9c3f13..8b511075d56 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs @@ -9,8 +9,6 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; - - namespace IO.Swagger.Model { /// @@ -38,13 +36,13 @@ namespace IO.Swagger.Model /// /// Gets or Sets Id /// - [DataMember(Name="id", EmitDefaultValue=true)] + [DataMember(Name="id", EmitDefaultValue=false)] public long? Id { get; set; } /// /// Gets or Sets Name /// - [DataMember(Name="name", EmitDefaultValue=true)] + [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } /// @@ -129,6 +127,4 @@ namespace IO.Swagger.Model } } - - } diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs index 6fdccef9a3e..2216619c0bf 100644 --- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs +++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs @@ -9,8 +9,6 @@ using System.Runtime.Serialization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; - - namespace IO.Swagger.Model { /// @@ -50,50 +48,50 @@ namespace IO.Swagger.Model /// /// Gets or Sets Id /// - [DataMember(Name="id", EmitDefaultValue=true)] + [DataMember(Name="id", EmitDefaultValue=false)] public long? Id { get; set; } /// /// Gets or Sets Username /// - [DataMember(Name="username", EmitDefaultValue=true)] + [DataMember(Name="username", EmitDefaultValue=false)] public string Username { get; set; } /// /// Gets or Sets FirstName /// - [DataMember(Name="firstName", EmitDefaultValue=true)] + [DataMember(Name="firstName", EmitDefaultValue=false)] public string FirstName { get; set; } /// /// Gets or Sets LastName /// - [DataMember(Name="lastName", EmitDefaultValue=true)] + [DataMember(Name="lastName", EmitDefaultValue=false)] public string LastName { get; set; } /// /// Gets or Sets Email /// - [DataMember(Name="email", EmitDefaultValue=true)] + [DataMember(Name="email", EmitDefaultValue=false)] public string Email { get; set; } /// /// Gets or Sets Password /// - [DataMember(Name="password", EmitDefaultValue=true)] + [DataMember(Name="password", EmitDefaultValue=false)] public string Password { get; set; } /// /// Gets or Sets Phone /// - [DataMember(Name="phone", EmitDefaultValue=true)] + [DataMember(Name="phone", EmitDefaultValue=false)] public string Phone { get; set; } /// /// User Status /// /// User Status - [DataMember(Name="userStatus", EmitDefaultValue=true)] + [DataMember(Name="userStatus", EmitDefaultValue=false)] public int? UserStatus { get; set; } /// @@ -232,6 +230,4 @@ namespace IO.Swagger.Model } } - - }