[C#][netcore] minor improvements and bug fixes

bin/configs/csharp-netcore-OpenAPIClientCore.yaml

@@ -1,6 +1,6 @@
 generatorName: csharp-netcore
 outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
 templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache

@@ -1,7 +1,7 @@
     /// <summary>
     /// {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "{{{name}}}")]
     {{#discriminator}}
     [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
     {{#children}}
@@ -55,7 +55,7 @@
     {{#hasOnlyReadOnly}}
         [JsonConstructorAttribute]
     {{/hasOnlyReadOnly}}
-        public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}}
+        public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{^isDateTime}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default({{{datatypeWithEnum}}}){{/isDateTime}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}}
         {
             {{#vars}}
             {{^isInherited}}

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// AdditionalPropertiesClass
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "AdditionalPropertiesClass")]
     public partial class AdditionalPropertiesClass : IEquatable<AdditionalPropertiesClass>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs

@@ -29,7 +29,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Animal
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Animal")]
     [JsonConverter(typeof(JsonSubtypes), "ClassName")]
     [JsonSubtypes.KnownSubType(typeof(Dog), "Dog")]
     [JsonSubtypes.KnownSubType(typeof(Cat), "Cat")]

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ApiResponse
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ApiResponse")]
     public partial class ApiResponse : IEquatable<ApiResponse>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ArrayOfArrayOfNumberOnly
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ArrayOfArrayOfNumberOnly")]
     public partial class ArrayOfArrayOfNumberOnly : IEquatable<ArrayOfArrayOfNumberOnly>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ArrayOfNumberOnly
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ArrayOfNumberOnly")]
     public partial class ArrayOfNumberOnly : IEquatable<ArrayOfNumberOnly>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ArrayTest
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ArrayTest")]
     public partial class ArrayTest : IEquatable<ArrayTest>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Capitalization
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Capitalization")]
     public partial class Capitalization : IEquatable<Capitalization>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Cat
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Cat")]
     public partial class Cat : Animal, IEquatable<Cat>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// CatAllOf
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Cat_allOf")]
     public partial class CatAllOf : IEquatable<CatAllOf>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Category
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Category")]
     public partial class Category : IEquatable<Category>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Model for testing model with \&quot;_class\&quot; property
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ClassModel")]
     public partial class ClassModel : IEquatable<ClassModel>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Dog
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Dog")]
     public partial class Dog : Animal, IEquatable<Dog>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// DogAllOf
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Dog_allOf")]
     public partial class DogAllOf : IEquatable<DogAllOf>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// EnumArrays
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "EnumArrays")]
     public partial class EnumArrays : IEquatable<EnumArrays>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// EnumTest
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Enum_Test")]
     public partial class EnumTest : IEquatable<EnumTest>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Must be named &#x60;File&#x60; for test.
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "File")]
     public partial class File : IEquatable<File>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// FileSchemaTestClass
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "FileSchemaTestClass")]
     public partial class FileSchemaTestClass : IEquatable<FileSchemaTestClass>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Foo
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Foo")]
     public partial class Foo : IEquatable<Foo>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// FormatTest
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "format_test")]
     public partial class FormatTest : IEquatable<FormatTest>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// HasOnlyReadOnly
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "hasOnlyReadOnly")]
     public partial class HasOnlyReadOnly : IEquatable<HasOnlyReadOnly>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "HealthCheckResult")]
     public partial class HealthCheckResult : IEquatable<HealthCheckResult>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object")]
     public partial class InlineObject : IEquatable<InlineObject>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject1.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject1
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object_1")]
     public partial class InlineObject1 : IEquatable<InlineObject1>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject2.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject2
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object_2")]
     public partial class InlineObject2 : IEquatable<InlineObject2>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject3.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject3
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object_3")]
     public partial class InlineObject3 : IEquatable<InlineObject3>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject4.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject4
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object_4")]
     public partial class InlineObject4 : IEquatable<InlineObject4>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineObject5.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineObject5
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_object_5")]
     public partial class InlineObject5 : IEquatable<InlineObject5>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/InlineResponseDefault.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// InlineResponseDefault
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "inline_response_default")]
     public partial class InlineResponseDefault : IEquatable<InlineResponseDefault>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// List
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "List")]
     public partial class List : IEquatable<List>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// MapTest
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "MapTest")]
     public partial class MapTest : IEquatable<MapTest>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// MixedPropertiesAndAdditionalPropertiesClass
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "MixedPropertiesAndAdditionalPropertiesClass")]
     public partial class MixedPropertiesAndAdditionalPropertiesClass : IEquatable<MixedPropertiesAndAdditionalPropertiesClass>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Model for testing model name starting with number
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "200_response")]
     public partial class Model200Response : IEquatable<Model200Response>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ModelClient
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "_Client")]
     public partial class ModelClient : IEquatable<ModelClient>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Model for testing model name same as property name
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Name")]
     public partial class Name : IEquatable<Name>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// NullableClass
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "NullableClass")]
     public partial class NullableClass : Dictionary<String, Object>, IEquatable<NullableClass>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// NumberOnly
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "NumberOnly")]
     public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Order
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Order")]
     public partial class Order : IEquatable<Order>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// OuterComposite
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "OuterComposite")]
     public partial class OuterComposite : IEquatable<OuterComposite>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Pet
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Pet")]
     public partial class Pet : IEquatable<Pet>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// ReadOnlyFirst
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "ReadOnlyFirst")]
     public partial class ReadOnlyFirst : IEquatable<ReadOnlyFirst>, IValidatableObject
     {
         /// <summary>

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs

@@ -28,7 +28,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// Model for testing reserved words
     /// </summary>
-    [DataContract]
+    [DataContract(Name = "Return")]
     public partial class Return : IEquatable<Return>, IValidatableObject
     {
         /// <summary>