loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

added value converter class (#15970)

Browse Source
This commit is contained in:
devhl-labs 2023-07-01 22:07:27 -04:00 committed by GitHub
parent 780d1fb3e2
commit 179d0bcb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 318 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache vendored
View File

@ -132,7 +132,7 @@ using System.Runtime.CompilerServices;
{{#isEnum}} {{#isEnum}}
if (obj is {{classname}} {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}) if (obj is {{classname}} {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}})
{{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}} {{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}}
return {{classname}}Converter.{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}}; return {{classname}}ValueConverter.{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}};
{{/isEnum}} {{/isEnum}}
{{^isEnum}} {{^isEnum}}
{{#vars}} {{#vars}}
@ -158,7 +158,7 @@ using System.Runtime.CompilerServices;
{{/models}} {{/models}}
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string{{nrt?}}> entries = new List<string{{nrt?}}>(); List<string{{nrt?}}> entries = new{{^net70OrLater}} List<string{{nrt?}}>{{/net70OrLater}}();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

4
modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache vendored
View File

@ -39,8 +39,8 @@ namespace {{packageName}}.{{clientPackage}}
{{#models}} {{#models}}
{{#model}} {{#model}}
{{#isEnum}} {{#isEnum}}
_jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter()); _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}JsonConverter());
_jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableConverter()); _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableJsonConverter());
{{/isEnum}} {{/isEnum}}
{{^isEnum}} {{^isEnum}}
_jsonOptions.Converters.Add(new {{classname}}JsonConverter()); _jsonOptions.Converters.Add(new {{classname}}JsonConverter());

6
modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache vendored
View File

@ -225,7 +225,7 @@
{{^isInnerEnum}} {{^isInnerEnum}}
{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null
? null ? null
: {{{datatypeWithEnum}}}Converter.FromStringOrDefault({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue); : {{{datatypeWithEnum}}}ValueConverter.FromStringOrDefault({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue);
{{/isInnerEnum}} {{/isInnerEnum}}
{{#isInnerEnum}} {{#isInnerEnum}}
{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null
@ -439,7 +439,7 @@
writer.WriteNull("{{baseName}}"); writer.WriteNull("{{baseName}}");
else else
{ {
var {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}Converter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}}); var {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}ValueConverter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
{{#allowableValues}} {{#allowableValues}}
{{#enumVars}} {{#enumVars}}
{{#-first}} {{#-first}}
@ -459,7 +459,7 @@
{{/isNullable}} {{/isNullable}}
{{^isNullable}} {{^isNullable}}
var {{#lambda.camelcase_param}}{{nameInCamelCase}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}Converter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}}); var {{#lambda.camelcase_param}}{{nameInCamelCase}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}ValueConverter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
{{#allowableValues}} {{#allowableValues}}
{{#enumVars}} {{#enumVars}}
{{#-first}} {{#-first}}

18
modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache vendored
View File

@ -44,10 +44,9 @@
{{#useGenericHost}} {{#useGenericHost}}
/// <summary> /// <summary>
/// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/> /// Converts <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter
public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/> /// Parses a given value to <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
@ -105,7 +104,14 @@
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
{{/isString}} {{/isString}}
} }
}
/// <summary>
/// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}JsonConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>
{
/// <summary> /// <summary>
/// Returns a {{datatypeWithEnum}} from the Json object /// Returns a {{datatypeWithEnum}} from the Json object
/// </summary> /// </summary>
@ -119,7 +125,7 @@
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null
? null ? null
: {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter.FromStringOrDefault(rawValue); : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -142,7 +148,7 @@
/// <summary> /// <summary>
/// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/> /// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
/// </summary> /// </summary>
public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}?> public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableJsonConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}?>
{ {
/// <summary> /// <summary>
/// Returns a {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} from the Json object /// Returns a {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} from the Json object
@ -157,7 +163,7 @@
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null
? null ? null
: {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter.FromStringOrDefault(rawValue); : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

14
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Client
if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
if (obj is EnumClass enumClass) if (obj is EnumClass enumClass)
return EnumClassConverter.ToJsonValue(enumClass); return EnumClassValueConverter.ToJsonValue(enumClass);
if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@ -156,24 +156,24 @@ namespace Org.OpenAPITools.Client
if (obj is Order.StatusEnum orderStatusEnum) if (obj is Order.StatusEnum orderStatusEnum)
return Order.StatusEnumToJsonValue(orderStatusEnum); return Order.StatusEnumToJsonValue(orderStatusEnum);
if (obj is OuterEnum outerEnum) if (obj is OuterEnum outerEnum)
return OuterEnumConverter.ToJsonValue(outerEnum); return OuterEnumValueConverter.ToJsonValue(outerEnum);
if (obj is OuterEnumDefaultValue outerEnumDefaultValue) if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
if (obj is OuterEnumInteger outerEnumInteger) if (obj is OuterEnumInteger outerEnumInteger)
return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
if (obj is Pet.StatusEnum petStatusEnum) if (obj is Pet.StatusEnum petStatusEnum)
return Pet.StatusEnumToJsonValue(petStatusEnum); return Pet.StatusEnumToJsonValue(petStatusEnum);
if (obj is Zebra.TypeEnum zebraTypeEnum) if (obj is Zebra.TypeEnum zebraTypeEnum)
return Zebra.TypeEnumToJsonValue(zebraTypeEnum); return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
if (obj is ZeroBasedEnum zeroBasedEnum) if (obj is ZeroBasedEnum zeroBasedEnum)
return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum); return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum) if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum); return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string?> entries = new List<string?>(); List<string?> entries = new();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

24
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs
View File

@ -67,8 +67,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new DogJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter());
_jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter());
_jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
_jsonOptions.Converters.Add(new EnumClassConverter()); _jsonOptions.Converters.Add(new EnumClassJsonConverter());
_jsonOptions.Converters.Add(new EnumClassNullableConverter()); _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
_jsonOptions.Converters.Add(new EnumTestJsonConverter()); _jsonOptions.Converters.Add(new EnumTestJsonConverter());
_jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter()); _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
_jsonOptions.Converters.Add(new FileJsonConverter()); _jsonOptions.Converters.Add(new FileJsonConverter());
@ -99,14 +99,14 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new OneOfStringJsonConverter()); _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
_jsonOptions.Converters.Add(new OrderJsonConverter()); _jsonOptions.Converters.Add(new OrderJsonConverter());
_jsonOptions.Converters.Add(new OuterCompositeJsonConverter()); _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumConverter()); _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new ParentPetJsonConverter()); _jsonOptions.Converters.Add(new ParentPetJsonConverter());
_jsonOptions.Converters.Add(new PetJsonConverter()); _jsonOptions.Converters.Add(new PetJsonConverter());
_jsonOptions.Converters.Add(new PigJsonConverter()); _jsonOptions.Converters.Add(new PigJsonConverter());
@ -129,8 +129,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new UserJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter());
_jsonOptions.Converters.Add(new WhaleJsonConverter()); _jsonOptions.Converters.Add(new WhaleJsonConverter());
_jsonOptions.Converters.Add(new ZebraJsonConverter()); _jsonOptions.Converters.Add(new ZebraJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
_services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
_services.AddSingleton<IApiFactory, ApiFactory>(); _services.AddSingleton<IApiFactory, ApiFactory>();

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs
View File

@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// Converts <see cref="EnumClass"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class EnumClassValueConverter
public class EnumClassConverter : JsonConverter<EnumClass>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="EnumClass"/> /// Parses a given value to <see cref="EnumClass"/>
@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="EnumClass"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class EnumClassJsonConverter : JsonConverter<EnumClass>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// A Json converter for type <see cref="EnumClass"/>
/// </summary> /// </summary>
public class EnumClassNullableConverter : JsonConverter<EnumClass?> public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
{ {
/// <summary> /// <summary>
/// Returns a EnumClass from the Json object /// Returns a EnumClass from the Json object
@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

16
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
View File

@ -571,25 +571,25 @@ namespace Org.OpenAPITools.Model
string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumDefaultValue = outerEnumDefaultValueRawValue == null outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
break; break;
case "outerEnumInteger": case "outerEnumInteger":
string? outerEnumIntegerRawValue = utf8JsonReader.GetString(); string? outerEnumIntegerRawValue = utf8JsonReader.GetString();
outerEnumInteger = outerEnumIntegerRawValue == null outerEnumInteger = outerEnumIntegerRawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
break; break;
case "outerEnumIntegerDefaultValue": case "outerEnumIntegerDefaultValue":
string? outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString(); string? outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
break; break;
case "outerEnum": case "outerEnum":
string? outerEnumRawValue = utf8JsonReader.GetString(); string? outerEnumRawValue = utf8JsonReader.GetString();
outerEnum = outerEnumRawValue == null outerEnum = outerEnumRawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(outerEnumRawValue); : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
break; break;
default: default:
break; break;
@ -664,23 +664,23 @@ namespace Org.OpenAPITools.Model
else else
writer.WriteNull("enum_string_required"); writer.WriteNull("enum_string_required");
var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
if (outerEnumDefaultValueRawValue != null) if (outerEnumDefaultValueRawValue != null)
writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
else else
writer.WriteNull("outerEnumDefaultValue"); writer.WriteNull("outerEnumDefaultValue");
var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
if (enumTest.OuterEnum == null) if (enumTest.OuterEnum == null)
writer.WriteNull("outerEnum"); writer.WriteNull("outerEnum");
else else
{ {
var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value); var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
if (outerEnumRawValue != null) if (outerEnumRawValue != null)
writer.WriteString("outerEnum", outerEnumRawValue); writer.WriteString("outerEnum", outerEnumRawValue);
else else

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs
View File

@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// Converts <see cref="OuterEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumValueConverter
public class OuterEnumConverter : JsonConverter<OuterEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnum"/> /// Parses a given value to <see cref="OuterEnum"/>
@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// A Json converter for type <see cref="OuterEnum"/>
/// </summary> /// </summary>
public class OuterEnumNullableConverter : JsonConverter<OuterEnum?> public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnum from the Json object /// Returns a OuterEnum from the Json object
@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
View File

@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumDefaultValueValueConverter
public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumDefaultValue"/> /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?> public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumDefaultValue from the Json object /// Returns a OuterEnumDefaultValue from the Json object
@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
View File

@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerValueConverter
public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumInteger"/> /// Parses a given value to <see cref="OuterEnumInteger"/>
@ -100,7 +99,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -114,7 +120,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -137,7 +143,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary> /// </summary>
public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?> public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumInteger from the Json object /// Returns a OuterEnumInteger from the Json object
@ -152,7 +158,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
View File

@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerDefaultValueValueConverter
public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/> /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@ -100,7 +99,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -114,7 +120,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -137,7 +143,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?> public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumIntegerDefaultValue from the Json object /// Returns a OuterEnumIntegerDefaultValue from the Json object
@ -152,7 +158,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
View File

@ -42,10 +42,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class ZeroBasedEnumValueConverter
public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="ZeroBasedEnum"/> /// Parses a given value to <see cref="ZeroBasedEnum"/>
@ -95,7 +94,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -109,7 +115,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -132,7 +138,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary> /// </summary>
public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?> public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
{ {
/// <summary> /// <summary>
/// Returns a ZeroBasedEnum from the Json object /// Returns a ZeroBasedEnum from the Json object
@ -147,7 +153,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

14
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Client
if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
if (obj is EnumClass enumClass) if (obj is EnumClass enumClass)
return EnumClassConverter.ToJsonValue(enumClass); return EnumClassValueConverter.ToJsonValue(enumClass);
if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@ -154,24 +154,24 @@ namespace Org.OpenAPITools.Client
if (obj is Order.StatusEnum orderStatusEnum) if (obj is Order.StatusEnum orderStatusEnum)
return Order.StatusEnumToJsonValue(orderStatusEnum); return Order.StatusEnumToJsonValue(orderStatusEnum);
if (obj is OuterEnum outerEnum) if (obj is OuterEnum outerEnum)
return OuterEnumConverter.ToJsonValue(outerEnum); return OuterEnumValueConverter.ToJsonValue(outerEnum);
if (obj is OuterEnumDefaultValue outerEnumDefaultValue) if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
if (obj is OuterEnumInteger outerEnumInteger) if (obj is OuterEnumInteger outerEnumInteger)
return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
if (obj is Pet.StatusEnum petStatusEnum) if (obj is Pet.StatusEnum petStatusEnum)
return Pet.StatusEnumToJsonValue(petStatusEnum); return Pet.StatusEnumToJsonValue(petStatusEnum);
if (obj is Zebra.TypeEnum zebraTypeEnum) if (obj is Zebra.TypeEnum zebraTypeEnum)
return Zebra.TypeEnumToJsonValue(zebraTypeEnum); return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
if (obj is ZeroBasedEnum zeroBasedEnum) if (obj is ZeroBasedEnum zeroBasedEnum)
return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum); return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum) if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum); return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string> entries = new List<string>(); List<string> entries = new();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

24
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
View File

@ -65,8 +65,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new DogJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter());
_jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter());
_jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
_jsonOptions.Converters.Add(new EnumClassConverter()); _jsonOptions.Converters.Add(new EnumClassJsonConverter());
_jsonOptions.Converters.Add(new EnumClassNullableConverter()); _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
_jsonOptions.Converters.Add(new EnumTestJsonConverter()); _jsonOptions.Converters.Add(new EnumTestJsonConverter());
_jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter()); _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
_jsonOptions.Converters.Add(new FileJsonConverter()); _jsonOptions.Converters.Add(new FileJsonConverter());
@ -97,14 +97,14 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new OneOfStringJsonConverter()); _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
_jsonOptions.Converters.Add(new OrderJsonConverter()); _jsonOptions.Converters.Add(new OrderJsonConverter());
_jsonOptions.Converters.Add(new OuterCompositeJsonConverter()); _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumConverter()); _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new ParentPetJsonConverter()); _jsonOptions.Converters.Add(new ParentPetJsonConverter());
_jsonOptions.Converters.Add(new PetJsonConverter()); _jsonOptions.Converters.Add(new PetJsonConverter());
_jsonOptions.Converters.Add(new PigJsonConverter()); _jsonOptions.Converters.Add(new PigJsonConverter());
@ -127,8 +127,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new UserJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter());
_jsonOptions.Converters.Add(new WhaleJsonConverter()); _jsonOptions.Converters.Add(new WhaleJsonConverter());
_jsonOptions.Converters.Add(new ZebraJsonConverter()); _jsonOptions.Converters.Add(new ZebraJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
_services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
_services.AddSingleton<IApiFactory, ApiFactory>(); _services.AddSingleton<IApiFactory, ApiFactory>();

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// Converts <see cref="EnumClass"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class EnumClassValueConverter
public class EnumClassConverter : JsonConverter<EnumClass>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="EnumClass"/> /// Parses a given value to <see cref="EnumClass"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="EnumClass"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class EnumClassJsonConverter : JsonConverter<EnumClass>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// A Json converter for type <see cref="EnumClass"/>
/// </summary> /// </summary>
public class EnumClassNullableConverter : JsonConverter<EnumClass?> public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
{ {
/// <summary> /// <summary>
/// Returns a EnumClass from the Json object /// Returns a EnumClass from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

16
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
View File

@ -569,25 +569,25 @@ namespace Org.OpenAPITools.Model
string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); string outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumDefaultValue = outerEnumDefaultValueRawValue == null outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
break; break;
case "outerEnumInteger": case "outerEnumInteger":
string outerEnumIntegerRawValue = utf8JsonReader.GetString(); string outerEnumIntegerRawValue = utf8JsonReader.GetString();
outerEnumInteger = outerEnumIntegerRawValue == null outerEnumInteger = outerEnumIntegerRawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
break; break;
case "outerEnumIntegerDefaultValue": case "outerEnumIntegerDefaultValue":
string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString(); string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
break; break;
case "outerEnum": case "outerEnum":
string outerEnumRawValue = utf8JsonReader.GetString(); string outerEnumRawValue = utf8JsonReader.GetString();
outerEnum = outerEnumRawValue == null outerEnum = outerEnumRawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(outerEnumRawValue); : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
break; break;
default: default:
break; break;
@ -662,23 +662,23 @@ namespace Org.OpenAPITools.Model
else else
writer.WriteNull("enum_string_required"); writer.WriteNull("enum_string_required");
var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
if (outerEnumDefaultValueRawValue != null) if (outerEnumDefaultValueRawValue != null)
writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
else else
writer.WriteNull("outerEnumDefaultValue"); writer.WriteNull("outerEnumDefaultValue");
var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
if (enumTest.OuterEnum == null) if (enumTest.OuterEnum == null)
writer.WriteNull("outerEnum"); writer.WriteNull("outerEnum");
else else
{ {
var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value); var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
if (outerEnumRawValue != null) if (outerEnumRawValue != null)
writer.WriteString("outerEnum", outerEnumRawValue); writer.WriteString("outerEnum", outerEnumRawValue);
else else

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// Converts <see cref="OuterEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumValueConverter
public class OuterEnumConverter : JsonConverter<OuterEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnum"/> /// Parses a given value to <see cref="OuterEnum"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// A Json converter for type <see cref="OuterEnum"/>
/// </summary> /// </summary>
public class OuterEnumNullableConverter : JsonConverter<OuterEnum?> public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnum from the Json object /// Returns a OuterEnum from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumDefaultValueValueConverter
public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumDefaultValue"/> /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?> public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumDefaultValue from the Json object /// Returns a OuterEnumDefaultValue from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerValueConverter
public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumInteger"/> /// Parses a given value to <see cref="OuterEnumInteger"/>
@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary> /// </summary>
public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?> public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumInteger from the Json object /// Returns a OuterEnumInteger from the Json object
@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerDefaultValueValueConverter
public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/> /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?> public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumIntegerDefaultValue from the Json object /// Returns a OuterEnumIntegerDefaultValue from the Json object
@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
View File

@ -40,10 +40,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class ZeroBasedEnumValueConverter
public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="ZeroBasedEnum"/> /// Parses a given value to <see cref="ZeroBasedEnum"/>
@ -93,7 +92,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -107,7 +113,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -130,7 +136,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary> /// </summary>
public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?> public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
{ {
/// <summary> /// <summary>
/// Returns a ZeroBasedEnum from the Json object /// Returns a ZeroBasedEnum from the Json object
@ -145,7 +151,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

2
samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
: "false"; : "false";
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string?> entries = new List<string?>(); List<string?> entries = new();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

2
samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
: "false"; : "false";
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string?> entries = new List<string?>(); List<string?> entries = new();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

2
samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
: "false"; : "false";
if (obj is ICollection collection) if (obj is ICollection collection)
{ {
List<string?> entries = new List<string?>(); List<string?> entries = new();
foreach (var entry in collection) foreach (var entry in collection)
entries.Add(ParameterToString(entry)); entries.Add(ParameterToString(entry));
return string.Join(",", entries); return string.Join(",", entries);

12
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs
View File

@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Client
if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
if (obj is EnumClass enumClass) if (obj is EnumClass enumClass)
return EnumClassConverter.ToJsonValue(enumClass); return EnumClassValueConverter.ToJsonValue(enumClass);
if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@ -154,19 +154,19 @@ namespace Org.OpenAPITools.Client
if (obj is Order.StatusEnum orderStatusEnum) if (obj is Order.StatusEnum orderStatusEnum)
return Order.StatusEnumToJsonValue(orderStatusEnum); return Order.StatusEnumToJsonValue(orderStatusEnum);
if (obj is OuterEnum outerEnum) if (obj is OuterEnum outerEnum)
return OuterEnumConverter.ToJsonValue(outerEnum); return OuterEnumValueConverter.ToJsonValue(outerEnum);
if (obj is OuterEnumDefaultValue outerEnumDefaultValue) if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
if (obj is OuterEnumInteger outerEnumInteger) if (obj is OuterEnumInteger outerEnumInteger)
return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
if (obj is Pet.StatusEnum petStatusEnum) if (obj is Pet.StatusEnum petStatusEnum)
return Pet.StatusEnumToJsonValue(petStatusEnum); return Pet.StatusEnumToJsonValue(petStatusEnum);
if (obj is Zebra.TypeEnum zebraTypeEnum) if (obj is Zebra.TypeEnum zebraTypeEnum)
return Zebra.TypeEnumToJsonValue(zebraTypeEnum); return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
if (obj is ZeroBasedEnum zeroBasedEnum) if (obj is ZeroBasedEnum zeroBasedEnum)
return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum); return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum) if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum); return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
if (obj is ICollection collection) if (obj is ICollection collection)

24
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
View File

@ -65,8 +65,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new DogJsonConverter()); _jsonOptions.Converters.Add(new DogJsonConverter());
_jsonOptions.Converters.Add(new DrawingJsonConverter()); _jsonOptions.Converters.Add(new DrawingJsonConverter());
_jsonOptions.Converters.Add(new EnumArraysJsonConverter()); _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
_jsonOptions.Converters.Add(new EnumClassConverter()); _jsonOptions.Converters.Add(new EnumClassJsonConverter());
_jsonOptions.Converters.Add(new EnumClassNullableConverter()); _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
_jsonOptions.Converters.Add(new EnumTestJsonConverter()); _jsonOptions.Converters.Add(new EnumTestJsonConverter());
_jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter()); _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
_jsonOptions.Converters.Add(new FileJsonConverter()); _jsonOptions.Converters.Add(new FileJsonConverter());
@ -97,14 +97,14 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new OneOfStringJsonConverter()); _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
_jsonOptions.Converters.Add(new OrderJsonConverter()); _jsonOptions.Converters.Add(new OrderJsonConverter());
_jsonOptions.Converters.Add(new OuterCompositeJsonConverter()); _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumConverter()); _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
_jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter()); _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
_jsonOptions.Converters.Add(new ParentPetJsonConverter()); _jsonOptions.Converters.Add(new ParentPetJsonConverter());
_jsonOptions.Converters.Add(new PetJsonConverter()); _jsonOptions.Converters.Add(new PetJsonConverter());
_jsonOptions.Converters.Add(new PigJsonConverter()); _jsonOptions.Converters.Add(new PigJsonConverter());
@ -127,8 +127,8 @@ namespace Org.OpenAPITools.Client
_jsonOptions.Converters.Add(new UserJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter());
_jsonOptions.Converters.Add(new WhaleJsonConverter()); _jsonOptions.Converters.Add(new WhaleJsonConverter());
_jsonOptions.Converters.Add(new ZebraJsonConverter()); _jsonOptions.Converters.Add(new ZebraJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
_services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
_services.AddSingleton<IApiFactory, ApiFactory>(); _services.AddSingleton<IApiFactory, ApiFactory>();

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// Converts <see cref="EnumClass"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class EnumClassValueConverter
public class EnumClassConverter : JsonConverter<EnumClass>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="EnumClass"/> /// Parses a given value to <see cref="EnumClass"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="EnumClass"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class EnumClassJsonConverter : JsonConverter<EnumClass>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="EnumClass"/> /// A Json converter for type <see cref="EnumClass"/>
/// </summary> /// </summary>
public class EnumClassNullableConverter : JsonConverter<EnumClass?> public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
{ {
/// <summary> /// <summary>
/// Returns a EnumClass from the Json object /// Returns a EnumClass from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
EnumClass? result = rawValue == null EnumClass? result = rawValue == null
? null ? null
: EnumClassConverter.FromStringOrDefault(rawValue); : EnumClassValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

16
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
View File

@ -569,25 +569,25 @@ namespace Org.OpenAPITools.Model
string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); string outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumDefaultValue = outerEnumDefaultValueRawValue == null outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
break; break;
case "outerEnumInteger": case "outerEnumInteger":
string outerEnumIntegerRawValue = utf8JsonReader.GetString(); string outerEnumIntegerRawValue = utf8JsonReader.GetString();
outerEnumInteger = outerEnumIntegerRawValue == null outerEnumInteger = outerEnumIntegerRawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
break; break;
case "outerEnumIntegerDefaultValue": case "outerEnumIntegerDefaultValue":
string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString(); string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
break; break;
case "outerEnum": case "outerEnum":
string outerEnumRawValue = utf8JsonReader.GetString(); string outerEnumRawValue = utf8JsonReader.GetString();
outerEnum = outerEnumRawValue == null outerEnum = outerEnumRawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(outerEnumRawValue); : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
break; break;
default: default:
break; break;
@ -662,23 +662,23 @@ namespace Org.OpenAPITools.Model
else else
writer.WriteNull("enum_string_required"); writer.WriteNull("enum_string_required");
var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue); var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
if (outerEnumDefaultValueRawValue != null) if (outerEnumDefaultValueRawValue != null)
writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue); writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
else else
writer.WriteNull("outerEnumDefaultValue"); writer.WriteNull("outerEnumDefaultValue");
var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger); var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue); writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue); var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue); writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
if (enumTest.OuterEnum == null) if (enumTest.OuterEnum == null)
writer.WriteNull("outerEnum"); writer.WriteNull("outerEnum");
else else
{ {
var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value); var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
if (outerEnumRawValue != null) if (outerEnumRawValue != null)
writer.WriteString("outerEnum", outerEnumRawValue); writer.WriteString("outerEnum", outerEnumRawValue);
else else

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// Converts <see cref="OuterEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumValueConverter
public class OuterEnumConverter : JsonConverter<OuterEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnum"/> /// Parses a given value to <see cref="OuterEnum"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnum"/> /// A Json converter for type <see cref="OuterEnum"/>
/// </summary> /// </summary>
public class OuterEnumNullableConverter : JsonConverter<OuterEnum?> public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnum from the Json object /// Returns a OuterEnum from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
OuterEnum? result = rawValue == null OuterEnum? result = rawValue == null
? null ? null
: OuterEnumConverter.FromStringOrDefault(rawValue); : OuterEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumDefaultValueValueConverter
public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumDefaultValue"/> /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumDefaultValue"/> /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?> public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumDefaultValue from the Json object /// Returns a OuterEnumDefaultValue from the Json object
@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
OuterEnumDefaultValue? result = rawValue == null OuterEnumDefaultValue? result = rawValue == null
? null ? null
: OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerValueConverter
public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumInteger"/> /// Parses a given value to <see cref="OuterEnumInteger"/>
@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumInteger"/> /// A Json converter for type <see cref="OuterEnumInteger"/>
/// </summary> /// </summary>
public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?> public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumInteger from the Json object /// Returns a OuterEnumInteger from the Json object
@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
OuterEnumInteger? result = rawValue == null OuterEnumInteger? result = rawValue == null
? null ? null
: OuterEnumIntegerConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
View File

@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class OuterEnumIntegerDefaultValueValueConverter
public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/> /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
{ {
return (int) value; return (int) value;
} }
}
/// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/> /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
/// </summary> /// </summary>
public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?> public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
{ {
/// <summary> /// <summary>
/// Returns a OuterEnumIntegerDefaultValue from the Json object /// Returns a OuterEnumIntegerDefaultValue from the Json object
@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
OuterEnumIntegerDefaultValue? result = rawValue == null OuterEnumIntegerDefaultValue? result = rawValue == null
? null ? null
: OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue); : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;

18
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
View File

@ -40,10 +40,9 @@ namespace Org.OpenAPITools.Model
} }
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
/// </summary> /// </summary>
/// <exception cref="NotImplementedException"></exception> public static class ZeroBasedEnumValueConverter
public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
{ {
/// <summary> /// <summary>
/// Parses a given value to <see cref="ZeroBasedEnum"/> /// Parses a given value to <see cref="ZeroBasedEnum"/>
@ -93,7 +92,14 @@ namespace Org.OpenAPITools.Model
throw new NotImplementedException($"Value could not be handled: '{value}'"); throw new NotImplementedException($"Value could not be handled: '{value}'");
} }
}
/// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary>
/// <exception cref="NotImplementedException"></exception>
public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
{
/// <summary> /// <summary>
/// Returns a from the Json object /// Returns a from the Json object
/// </summary> /// </summary>
@ -107,7 +113,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;
@ -130,7 +136,7 @@ namespace Org.OpenAPITools.Model
/// <summary> /// <summary>
/// A Json converter for type <see cref="ZeroBasedEnum"/> /// A Json converter for type <see cref="ZeroBasedEnum"/>
/// </summary> /// </summary>
public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?> public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
{ {
/// <summary> /// <summary>
/// Returns a ZeroBasedEnum from the Json object /// Returns a ZeroBasedEnum from the Json object
@ -145,7 +151,7 @@ namespace Org.OpenAPITools.Model
ZeroBasedEnum? result = rawValue == null ZeroBasedEnum? result = rawValue == null
? null ? null
: ZeroBasedEnumConverter.FromStringOrDefault(rawValue); : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
if (result != null) if (result != null)
return result.Value; return result.Value;