diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml index 447f6f575833..9d55e4250580 100644 --- a/bin/utils/test_file_list.yaml +++ b/bin/utils/test_file_list.yaml @@ -1,5 +1,7 @@ --- # csharp-netcore test files and image for upload +- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" + sha256: ec34838fbbb1abb9f762949d510503b6237b607400a85c848c234c39d013a776 - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" sha256: dae985015ba461297927d544a78267f2def35e07c3f14ca66468fd61e1fd1c26 - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 0bdb7cb27ded..9727c5a0185f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -500,6 +500,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } } + /* Comment out the following as model.dataType is always the model name, eg. OuterIntegerEnum, + * and this will fix the integer enum via #9035. + * Only x-enum-byte is used in the template but it won't work due to the bug mentioned above. + * A better solution is to introduce isLong, isInteger, etc in the DefaultCodegen + * so that there is no need for each generator to post-process model enums. + * // We're looping all models here. if (model.isEnum) { // We now need to make allowableValues.enumVars look like the context of CodegenProperty @@ -543,7 +549,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co if (!newEnumVars.isEmpty()) { model.allowableValues.put("enumVars", newEnumVars); } - } + } */ } else { LOGGER.warn("Expected to retrieve model %s by name, but no model was found. Check your -Dmodels inclusions.", openAPIName); } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache deleted file mode 100644 index de8c602a14dc..000000000000 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache +++ /dev/null @@ -1,20 +0,0 @@ - /// - /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} - /// - {{#description}} - /// {{description}} - {{/description}} - [JsonConverter(typeof(StringEnumConverter))] - {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} - { - {{#allowableValues}} - {{#enumVars}} - /// - /// Enum {{name}} for {{{value}}} - /// - [EnumMember(Value = {{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isFloat}}"{{/isFloat}}{{#isDouble}}"{{/isDouble}}{{{value}}}{{#isLong}}"{{/isLong}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isFloat}}"{{/isFloat}})] - {{name}}{{#isLong}} = {{{value}}}{{/isLong}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^isInteger}} = {{-index}}{{/isInteger}}{{^-last}},{{/-last}} - - {{/enumVars}} - {{/allowableValues}} - } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache index c1a70a37f2dd..39bcd2eddc1f 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache @@ -4,9 +4,15 @@ {{#description}} /// {{description}} {{/description}} - {{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}} + {{#allowableValues}} + {{#enumVars}} + {{#-first}} + {{#isString}} [JsonConverter(typeof(StringEnumConverter))] - {{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}} + {{/isString}} + {{/-first}} + {{/enumVars}} + {{/allowableValues}} {{>visibility}} enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}}: byte{{/vendorExtensions.x-enum-byte}} { {{#allowableValues}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs index 99f8afbbbfd5..48b3d7d0e7e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines EnumClass /// - [JsonConverter(typeof(StringEnumConverter))] - public enum EnumClass { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs index 3b2dc2a110af..2aa496a2e074 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnum /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnum { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 04d88ac8fecf..dd79c7010d6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumDefaultValue { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index da111ad9341d..44dc91c700ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumInteger /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index ff0d85056238..b927507cf97a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumIntegerDefaultValue /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs index 99f8afbbbfd5..48b3d7d0e7e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines EnumClass /// - [JsonConverter(typeof(StringEnumConverter))] - public enum EnumClass { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs index 3b2dc2a110af..2aa496a2e074 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnum /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnum { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 04d88ac8fecf..dd79c7010d6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumDefaultValue { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index da111ad9341d..44dc91c700ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumInteger /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index ff0d85056238..b927507cf97a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumIntegerDefaultValue /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs index 99f8afbbbfd5..48b3d7d0e7e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines EnumClass /// - [JsonConverter(typeof(StringEnumConverter))] - public enum EnumClass { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs index 3b2dc2a110af..2aa496a2e074 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnum /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnum { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 04d88ac8fecf..dd79c7010d6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumDefaultValue { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index da111ad9341d..44dc91c700ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumInteger /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index ff0d85056238..b927507cf97a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumIntegerDefaultValue /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs index 9dc60b812323..9a5f17e0431d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs @@ -162,5 +162,14 @@ namespace Org.OpenAPITools.Test Assert.Null(f.GetType().GetProperty("unknown_property")); } + /// + /// Test OuterEnumInteger + /// + [Fact] + public void OuterEnumIntegerInstanceTest() + { + OuterEnumInteger instance = OuterEnumInteger.NUMBER_1; + Assert.Equal(1, (int)instance); + } } -} \ No newline at end of file +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs index 99f8afbbbfd5..48b3d7d0e7e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines EnumClass /// - [JsonConverter(typeof(StringEnumConverter))] - public enum EnumClass { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs index 3b2dc2a110af..2aa496a2e074 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnum /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnum { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 04d88ac8fecf..dd79c7010d6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumDefaultValue { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index da111ad9341d..44dc91c700ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumInteger /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index ff0d85056238..b927507cf97a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumIntegerDefaultValue /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs index 99f8afbbbfd5..48b3d7d0e7e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines EnumClass /// - [JsonConverter(typeof(StringEnumConverter))] - public enum EnumClass { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs index 3b2dc2a110af..2aa496a2e074 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnum /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnum { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 04d88ac8fecf..dd79c7010d6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -29,9 +29,7 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumDefaultValue { /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index da111ad9341d..44dc91c700ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumInteger /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index ff0d85056238..b927507cf97a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -29,28 +29,22 @@ namespace Org.OpenAPITools.Model /// /// Defines OuterEnumIntegerDefaultValue /// - - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 25bd78709de9..58b3eac73b1b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -28,27 +28,22 @@ namespace Org.OpenAPITools.Model /// Defines OuterEnumInteger /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumInteger { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 4084fc1d6f06..d45f40bbbe8b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -28,27 +28,22 @@ namespace Org.OpenAPITools.Model /// Defines OuterEnumIntegerDefaultValue /// - [JsonConverter(typeof(StringEnumConverter))] - public enum OuterEnumIntegerDefaultValue { /// /// Enum NUMBER_0 for value: 0 /// - [EnumMember(Value = "0")] - NUMBER_0 = 1, + NUMBER_0 = 0, /// /// Enum NUMBER_1 for value: 1 /// - [EnumMember(Value = "1")] - NUMBER_1 = 2, + NUMBER_1 = 1, /// /// Enum NUMBER_2 for value: 2 /// - [EnumMember(Value = "2")] - NUMBER_2 = 3 + NUMBER_2 = 2 }