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 2d4d954597e..17cecd8553e 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 @@ -456,7 +456,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true)) .put("required", new RequiredParameterLambda().generator(this)) .put("optional", new OptionalParameterLambda().generator(this)) - .put("joinWithComma", new JoinWithCommaLambda()); + .put("joinWithComma", new JoinWithCommaLambda()) + .put("trimLineBreaks", new TrimLineBreaksLambda()); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimLineBreaksLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimLineBreaksLambda.java new file mode 100644 index 00000000000..702b0cf258b --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimLineBreaksLambda.java @@ -0,0 +1,47 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * 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 + * + * https://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. + */ + +package org.openapitools.codegen.templating.mustache; + +import java.io.IOException; +import java.io.Writer; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template.Fragment; + +/** + * Replaces duplicate line break characters in a fragment with single line break. + * + * Register: + * 
+ * additionalProperties.put("trimLineBreaks", new TrimLineBreaksLambda());
+ *
+ * + * Use: + * 
+ * {{#trimLineBreaks}}{{name}}{{/trimLineBreaks}}
+ *
+ */ +public class TrimLineBreaksLambda implements Mustache.Lambda { + private static final String SINGLE_LINE_BREAK = "\n\n"; + + private static final String LINE_BREAK_REGEX = "\n\n+"; + + @Override + public void execute(Fragment fragment, Writer writer) throws IOException { + writer.write(fragment.execute().replaceAll(LINE_BREAK_REGEX, SINGLE_LINE_BREAK)); + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index ab696e225e2..d6db8806918 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -212,6 +212,7 @@ /// public override void Write(Utf8JsonWriter writer, {{classname}} {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}, JsonSerializerOptions jsonSerializerOptions) { + {{#lambda.trimLineBreaks}} {{#composedSchemas.anyOf}} {{^vendorExtensions.x-duplicated-data-type}} System.Text.Json.JsonSerializer.Serialize(writer, {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}, jsonSerializerOptions); @@ -245,10 +246,12 @@ {{/isString}} {{#isBoolean}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} != null) writer.WriteBoolean("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.Value); else writer.WriteNull("{{baseName}}"); + {{/isNullable}} {{^isNullable}} writer.WriteBoolean("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}); @@ -257,10 +260,12 @@ {{^isEnum}} {{#isNumeric}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} != null) writer.WriteNumber("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.Value); else writer.WriteNull("{{baseName}}"); + {{/isNullable}} {{^isNullable}} writer.WriteNumber("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}); @@ -269,10 +274,12 @@ {{/isEnum}} {{#isDate}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} != null) writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.Value.ToString({{name}}Format)); else writer.WriteNull("{{baseName}}"); + {{/isNullable}} {{^isNullable}} writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.ToString({{name}}Format)); @@ -280,10 +287,12 @@ {{/isDate}} {{#isDateTime}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} != null) writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.Value.ToString({{name}}Format)); else writer.WriteNull("{{baseName}}"); + {{/isNullable}} {{^isNullable}} writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.ToString({{name}}Format)); @@ -296,14 +305,17 @@ {{^isMap}} {{^isNumeric}} {{#isInnerEnum}} + var {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = {{classname}}.{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}); if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue != null) writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue); else writer.WriteNull("{{baseName}}"); + {{/isInnerEnum}} {{^isInnerEnum}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} == null) writer.WriteNull("{{baseName}}"); else @@ -325,6 +337,7 @@ {{/enumVars}} {{/allowableValues}} } + {{/isNullable}} {{^isNullable}} var {{#lambda.camelcase_param}}{{datatypeWithEnum}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}Converter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}}); @@ -332,10 +345,12 @@ {{#enumVars}} {{#-first}} {{#isString}} + if ({{#lambda.camelcase_param}}{{datatypeWithEnum}}{{/lambda.camelcase_param}}RawValue != null) writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{datatypeWithEnum}}{{/lambda.camelcase_param}}RawValue); else writer.WriteNull("{{baseName}}"); + {{/isString}} {{^isString}} writer.WriteNumber("{{baseName}}", {{#lambda.camelcase_param}}{{datatypeWithEnum}}{{/lambda.camelcase_param}}RawValue); @@ -353,10 +368,12 @@ writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}); {{/isNullable}} {{#isNullable}} + if ({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}} == null) writer.WriteNull("{{baseName}}"); else writer.WriteString("{{baseName}}", {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}.Value); + {{/isNullable}} {{/isUuid}} {{^isUuid}} @@ -379,5 +396,6 @@ writer.WriteEndObject(); {{/composedSchemas}} + {{/lambda.trimLineBreaks}} } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache index 0e488397282..68931c3c14d 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache @@ -24,7 +24,6 @@ namespace {{packageName}}.Test.{{apiPackage}} { _instance = _host.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); } - {{#operations}} {{#operation}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index ed46652a9e4..9b3d7132dcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test Call123TestSpecialTags /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index bc035ebd867..6861aa2a227 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FooGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 2b8892c9033..920362b0292 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FakeHealthGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index d9901633b5c..3f4cc38d494 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test TestClassname /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index 9bfbd835f93..2bb24b0a0c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test AddPet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index d8baa3541b7..78943a47a02 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test DeleteOrder /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index 451b84bb03e..b17385d0209 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test CreateUser /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index ff8e259be8a..e7715f15cf2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -217,6 +217,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("name", childCatAllOf.Name); + var petTypeRawValue = ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOf.PetType); if (petTypeRawValue != null) writer.WriteString("pet_type", petTypeRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs index 2b909ff50bf..5887dce5f57 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -299,6 +299,7 @@ namespace Org.OpenAPITools.Model writer.WritePropertyName("array_enum"); JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, jsonSerializerOptions); + var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol); if (justSymbolRawValue != null) writer.WriteString("just_symbol", justSymbolRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs index 7fae7b2ab51..1d25c1be48d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs @@ -638,25 +638,31 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger)); writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly)); writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber)); + var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString); if (enumStringRawValue != null) writer.WriteString("enum_string", enumStringRawValue); else writer.WriteNull("enum_string"); + var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired); if (enumStringRequiredRawValue != null) writer.WriteString("enum_string_required", enumStringRequiredRawValue); else writer.WriteNull("enum_string_required"); + var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); + if (outerEnumDefaultValueRawValue != null) writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); else writer.WriteNull("outerEnumDefaultValue"); + var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); + if (enumTest.OuterEnum == null) writer.WriteNull("outerEnum"); else diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index b58e07aa45d..bcd2e58250b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -314,26 +314,32 @@ namespace Org.OpenAPITools.Model JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("array_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, jsonSerializerOptions); + if (nullableClass.BooleanProp != null) writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value); else writer.WriteNull("boolean_prop"); + if (nullableClass.DateProp != null) writer.WriteString("date_prop", nullableClass.DateProp.Value.ToString(DatePropFormat)); else writer.WriteNull("date_prop"); + if (nullableClass.DatetimeProp != null) writer.WriteString("datetime_prop", nullableClass.DatetimeProp.Value.ToString(DatetimePropFormat)); else writer.WriteNull("datetime_prop"); + if (nullableClass.IntegerProp != null) writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value); else writer.WriteNull("integer_prop"); + if (nullableClass.NumberProp != null) writer.WriteNumber("number_prop", nullableClass.NumberProp.Value); else writer.WriteNull("number_prop"); + writer.WritePropertyName("object_and_items_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("object_nullable_prop"); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index abf5e0bdaf2..17851d7ac44 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -325,11 +325,13 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("petId", order.PetId); writer.WriteNumber("quantity", order.Quantity); writer.WriteString("shipDate", order.ShipDate.ToString(ShipDateFormat)); + var statusRawValue = Order.StatusEnumToJsonValue(order.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WriteBoolean("complete", order.Complete); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index da889e75633..0a16ec5feb7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -321,11 +321,13 @@ namespace Org.OpenAPITools.Model writer.WriteString("name", pet.Name); writer.WritePropertyName("photoUrls"); JsonSerializer.Serialize(writer, pet.PhotoUrls, jsonSerializerOptions); + var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WritePropertyName("tags"); JsonSerializer.Serialize(writer, pet.Tags, jsonSerializerOptions); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs index 35ec573fd5a..baeafbe1338 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs @@ -246,6 +246,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", zebra.ClassName); + var typeRawValue = Zebra.TypeEnumToJsonValue(zebra.Type); if (typeRawValue != null) writer.WriteString("type", typeRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index 97963e7f2f8..17a8392e00a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test Call123TestSpecialTags /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 0febb601c4c..7d6b4d9f814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FooGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 3c488dc824b..ff46c9ec3ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FakeHealthGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index 49a3c9c5dd0..05cc0ae4fed 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test TestClassname /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index 165e4dd8072..5f43e98fd32 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test AddPet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index 14bcad8de1b..47f3b907009 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test DeleteOrder /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index 014c03f5c7e..7f01e423b28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test CreateUser /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index eb0aac3f778..3a9ecdaa407 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -215,6 +215,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("name", childCatAllOf.Name); + var petTypeRawValue = ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOf.PetType); if (petTypeRawValue != null) writer.WriteString("pet_type", petTypeRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 13eef42111b..fd898427833 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -297,6 +297,7 @@ namespace Org.OpenAPITools.Model writer.WritePropertyName("array_enum"); JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, jsonSerializerOptions); + var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol); if (justSymbolRawValue != null) writer.WriteString("just_symbol", justSymbolRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs index e8977651c72..d5167f76f18 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -636,25 +636,31 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger)); writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly)); writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber)); + var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString); if (enumStringRawValue != null) writer.WriteString("enum_string", enumStringRawValue); else writer.WriteNull("enum_string"); + var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired); if (enumStringRequiredRawValue != null) writer.WriteString("enum_string_required", enumStringRequiredRawValue); else writer.WriteNull("enum_string_required"); + var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); + if (outerEnumDefaultValueRawValue != null) writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); else writer.WriteNull("outerEnumDefaultValue"); + var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); + if (enumTest.OuterEnum == null) writer.WriteNull("outerEnum"); else diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index 0bb5b5b25eb..1446cb49964 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -312,26 +312,32 @@ namespace Org.OpenAPITools.Model JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("array_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, jsonSerializerOptions); + if (nullableClass.BooleanProp != null) writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value); else writer.WriteNull("boolean_prop"); + if (nullableClass.DateProp != null) writer.WriteString("date_prop", nullableClass.DateProp.Value.ToString(DatePropFormat)); else writer.WriteNull("date_prop"); + if (nullableClass.DatetimeProp != null) writer.WriteString("datetime_prop", nullableClass.DatetimeProp.Value.ToString(DatetimePropFormat)); else writer.WriteNull("datetime_prop"); + if (nullableClass.IntegerProp != null) writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value); else writer.WriteNull("integer_prop"); + if (nullableClass.NumberProp != null) writer.WriteNumber("number_prop", nullableClass.NumberProp.Value); else writer.WriteNull("number_prop"); + writer.WritePropertyName("object_and_items_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("object_nullable_prop"); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 55355219971..a4cd5acc6f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -323,11 +323,13 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("petId", order.PetId); writer.WriteNumber("quantity", order.Quantity); writer.WriteString("shipDate", order.ShipDate.ToString(ShipDateFormat)); + var statusRawValue = Order.StatusEnumToJsonValue(order.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WriteBoolean("complete", order.Complete); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index 47daaac2168..45128ac6635 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -319,11 +319,13 @@ namespace Org.OpenAPITools.Model writer.WriteString("name", pet.Name); writer.WritePropertyName("photoUrls"); JsonSerializer.Serialize(writer, pet.PhotoUrls, jsonSerializerOptions); + var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WritePropertyName("tags"); JsonSerializer.Serialize(writer, pet.Tags, jsonSerializerOptions); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs index ead1a7055e1..970f74858a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -244,6 +244,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", zebra.ClassName); + var typeRawValue = Zebra.TypeEnumToJsonValue(zebra.Type); if (typeRawValue != null) writer.WriteString("type", typeRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 761f616d15f..93c82442234 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test List /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index de887324595..1e6713689ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test RootGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index de887324595..1e6713689ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test RootGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index 97963e7f2f8..17a8392e00a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test Call123TestSpecialTags /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 0febb601c4c..7d6b4d9f814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FooGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 3c488dc824b..ff46c9ec3ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test FakeHealthGet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index 49a3c9c5dd0..05cc0ae4fed 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test TestClassname /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index 165e4dd8072..5f43e98fd32 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test AddPet /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index 14bcad8de1b..47f3b907009 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test DeleteOrder /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index 014c03f5c7e..7f01e423b28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api _instance = _host.Services.GetRequiredService(); } - /// /// Test CreateUser /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index eb0aac3f778..3a9ecdaa407 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -215,6 +215,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("name", childCatAllOf.Name); + var petTypeRawValue = ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOf.PetType); if (petTypeRawValue != null) writer.WriteString("pet_type", petTypeRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 13eef42111b..fd898427833 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -297,6 +297,7 @@ namespace Org.OpenAPITools.Model writer.WritePropertyName("array_enum"); JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, jsonSerializerOptions); + var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol); if (justSymbolRawValue != null) writer.WriteString("just_symbol", justSymbolRawValue); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs index e8977651c72..d5167f76f18 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -636,25 +636,31 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger)); writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly)); writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber)); + var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString); if (enumStringRawValue != null) writer.WriteString("enum_string", enumStringRawValue); else writer.WriteNull("enum_string"); + var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired); if (enumStringRequiredRawValue != null) writer.WriteString("enum_string_required", enumStringRequiredRawValue); else writer.WriteNull("enum_string_required"); + var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); + if (outerEnumDefaultValueRawValue != null) writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); else writer.WriteNull("outerEnumDefaultValue"); + var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); + if (enumTest.OuterEnum == null) writer.WriteNull("outerEnum"); else diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index 0bb5b5b25eb..1446cb49964 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -312,26 +312,32 @@ namespace Org.OpenAPITools.Model JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("array_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, jsonSerializerOptions); + if (nullableClass.BooleanProp != null) writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value); else writer.WriteNull("boolean_prop"); + if (nullableClass.DateProp != null) writer.WriteString("date_prop", nullableClass.DateProp.Value.ToString(DatePropFormat)); else writer.WriteNull("date_prop"); + if (nullableClass.DatetimeProp != null) writer.WriteString("datetime_prop", nullableClass.DatetimeProp.Value.ToString(DatetimePropFormat)); else writer.WriteNull("datetime_prop"); + if (nullableClass.IntegerProp != null) writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value); else writer.WriteNull("integer_prop"); + if (nullableClass.NumberProp != null) writer.WriteNumber("number_prop", nullableClass.NumberProp.Value); else writer.WriteNull("number_prop"); + writer.WritePropertyName("object_and_items_nullable_prop"); JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, jsonSerializerOptions); writer.WritePropertyName("object_nullable_prop"); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 55355219971..a4cd5acc6f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -323,11 +323,13 @@ namespace Org.OpenAPITools.Model writer.WriteNumber("petId", order.PetId); writer.WriteNumber("quantity", order.Quantity); writer.WriteString("shipDate", order.ShipDate.ToString(ShipDateFormat)); + var statusRawValue = Order.StatusEnumToJsonValue(order.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WriteBoolean("complete", order.Complete); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index 47daaac2168..45128ac6635 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -319,11 +319,13 @@ namespace Org.OpenAPITools.Model writer.WriteString("name", pet.Name); writer.WritePropertyName("photoUrls"); JsonSerializer.Serialize(writer, pet.PhotoUrls, jsonSerializerOptions); + var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status); if (statusRawValue != null) writer.WriteString("status", statusRawValue); else writer.WriteNull("status"); + writer.WritePropertyName("tags"); JsonSerializer.Serialize(writer, pet.Tags, jsonSerializerOptions); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs index ead1a7055e1..970f74858a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -244,6 +244,7 @@ namespace Org.OpenAPITools.Model writer.WriteStartObject(); writer.WriteString("className", zebra.ClassName); + var typeRawValue = Zebra.TypeEnumToJsonValue(zebra.Type); if (typeRawValue != null) writer.WriteString("type", typeRawValue);