[csharp-netcore][generichost] Improved spacing (#15740)

* improved spacing

* addressed comment
This commit is contained in:
devhl-labs 2023-06-03 08:05:08 -04:00 committed by GitHub
parent 2b9d94cb0a
commit 0943e5063a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 124 additions and 26 deletions

View File

@ -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

View File

@ -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:
* <pre>
* additionalProperties.put("trimLineBreaks", new TrimLineBreaksLambda());
* </pre>
*
* Use:
* <pre>
* {{#trimLineBreaks}}{{name}}{{/trimLineBreaks}}
* </pre>
*/
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));
}
}

View File

@ -212,6 +212,7 @@
/// <exception cref="NotImplementedException"></exception>
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}}
}
}

View File

@ -24,7 +24,6 @@ namespace {{packageName}}.Test.{{apiPackage}}
{
_instance = _host.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>();
}
{{#operations}}
{{#operation}}

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IAnotherFakeApi>();
}
/// <summary>
/// Test Call123TestSpecialTags
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test FooGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeApi>();
}
/// <summary>
/// Test FakeHealthGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeClassnameTags123Api>();
}
/// <summary>
/// Test TestClassname
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IPetApi>();
}
/// <summary>
/// Test AddPet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IStoreApi>();
}
/// <summary>
/// Test DeleteOrder
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IUserApi>();
}
/// <summary>
/// Test CreateUser
/// </summary>

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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");

View File

@ -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();

View File

@ -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);

View File

@ -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);

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IAnotherFakeApi>();
}
/// <summary>
/// Test Call123TestSpecialTags
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test FooGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeApi>();
}
/// <summary>
/// Test FakeHealthGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeClassnameTags123Api>();
}
/// <summary>
/// Test TestClassname
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IPetApi>();
}
/// <summary>
/// Test AddPet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IStoreApi>();
}
/// <summary>
/// Test DeleteOrder
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IUserApi>();
}
/// <summary>
/// Test CreateUser
/// </summary>

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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");

View File

@ -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();

View File

@ -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);

View File

@ -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);

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test List
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test RootGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test RootGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IAnotherFakeApi>();
}
/// <summary>
/// Test Call123TestSpecialTags
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IDefaultApi>();
}
/// <summary>
/// Test FooGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeApi>();
}
/// <summary>
/// Test FakeHealthGet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IFakeClassnameTags123Api>();
}
/// <summary>
/// Test TestClassname
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IPetApi>();
}
/// <summary>
/// Test AddPet
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IStoreApi>();
}
/// <summary>
/// Test DeleteOrder
/// </summary>

View File

@ -50,7 +50,6 @@ namespace Org.OpenAPITools.Test.Api
_instance = _host.Services.GetRequiredService<IApi.IUserApi>();
}
/// <summary>
/// Test CreateUser
/// </summary>

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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");

View File

@ -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();

View File

@ -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);

View File

@ -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);