Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ namespace {{packageName}}.{{clientPackage}}
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
{{#models}}
{{#model}}
{{#isEnum}}
Expand All @@ -48,6 +47,8 @@ namespace {{packageName}}.{{clientPackage}}
{{/isEnum}}
{{/model}}
{{/models}}
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new{{^net60OrLater}} JsonSerializerOptionsProvider{{/net60OrLater}}(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
{{#useSourceGeneration}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,38 @@ public void testGenericHostWritesUnsetAndNullInnerStringEnums() throws IOExcepti
+ " writer.WriteString(\"kind\", kindRawValue); }");
}

@Test
public void testGenericHostRegistersGenericStringEnumConverterLast() throws IOException {
OpenAPI openAPI = new OpenAPI().components(new Components().addSchemas("Day",
new StringSchema()._enum(List.of("monday", "tuesday"))));

File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
output.deleteOnExit();
DefaultGenerator generator = new DefaultGenerator();
ClientOptInput input = new ClientOptInput().openAPI(openAPI);
CSharpClientCodegen codegen = new CSharpClientCodegen();
codegen.setLibrary("generichost");
codegen.setOutputDir(output.getAbsolutePath());
input.config(codegen);

Map<String, File> files = generator.opts(input).generate().stream()
.collect(Collectors.toMap(File::getPath, Function.identity()));
File hostConfiguration = files.get(Paths.get(output.getAbsolutePath(),
"src", "Org.OpenAPITools", "Client", "HostConfiguration.cs").toString());
assertNotNull(hostConfiguration);
// The generic JsonStringEnumConverter matches every enum, and System.Text.Json
// uses the first matching converter, so it must be registered after the
// generated schema-specific converters.
String content = Files.readString(hostConfiguration.toPath());
int schemaSpecific = content.indexOf("new DayJsonConverter()");
int schemaSpecificNullable = content.indexOf("new DayNullableJsonConverter()");
int generic = content.indexOf("new JsonStringEnumConverter()");
assertThat(schemaSpecific).isGreaterThanOrEqualTo(0);
assertThat(schemaSpecificNullable).isGreaterThanOrEqualTo(0);
assertThat(generic).isGreaterThan(schemaSpecific);
assertThat(generic).isGreaterThan(schemaSpecificNullable);
}

@Test
public void testGenericHostOneOfConstructorsRespectApiVisibility() throws IOException {
Map<String, File> publicModels = generateIssue23046Models(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AnyOfStringArrayOfStringJsonConverter());
_jsonOptions.Converters.Add(new NumberJsonConverter());
_jsonOptions.Converters.Add(new NumberNullableJsonConverter());
Expand All @@ -57,6 +56,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new SingleAnyOfTestNullableJsonConverter());
_jsonOptions.Converters.Add(new TypeIntegerWithOneOfJsonConverter());
_jsonOptions.Converters.Add(new TypeIntegerWithOneOfNullableJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AreaCodeJsonConverter());
_jsonOptions.Converters.Add(new AreaCodeNullableJsonConverter());
_jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter());
_jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter());
_jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter());
_jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new HelloWorldPostRequestJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new FooJsonConverter());
_jsonOptions.Converters.Add(new IconsDefaultResponseJsonConverter());
_jsonOptions.Converters.Add(new IconsSizeParameterJsonConverter());
_jsonOptions.Converters.Add(new IconsSizeParameterAnyOfJsonConverter());
_jsonOptions.Converters.Add(new IconsSizeParameterAnyOfNullableJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new ColorJsonConverter());
_jsonOptions.Converters.Add(new ColorOrNullJsonConverter());
_jsonOptions.Converters.Add(new NullTypeDirectJsonConverter());
_jsonOptions.Converters.Add(new ShapeJsonConverter());
_jsonOptions.Converters.Add(new ShapeOrNullJsonConverter());
_jsonOptions.Converters.Add(new WidgetJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new OneOfArrayRequestJsonConverter());
_jsonOptions.Converters.Add(new TestObjectJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AppleJsonConverter());
_jsonOptions.Converters.Add(new AssetJsonConverter());
_jsonOptions.Converters.Add(new BananaJsonConverter());
Expand All @@ -65,6 +64,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new StatusJsonConverter());
_jsonOptions.Converters.Add(new StatusNullableJsonConverter());
_jsonOptions.Converters.Add(new StatusOrTextJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new ActivityJsonConverter());
_jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
_jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
Expand Down Expand Up @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AdultJsonConverter());
_jsonOptions.Converters.Add(new ChildJsonConverter());
_jsonOptions.Converters.Add(new PersonJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AppleJsonConverter());
_jsonOptions.Converters.Add(new BananaJsonConverter());
_jsonOptions.Converters.Add(new FruitJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AppleJsonConverter());
_jsonOptions.Converters.Add(new BananaJsonConverter());
_jsonOptions.Converters.Add(new FruitJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new ActivityJsonConverter());
_jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
_jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
Expand Down Expand Up @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new ActivityJsonConverter());
_jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
_jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
Expand Down Expand Up @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new AppleJsonConverter());
_jsonOptions.Converters.Add(new BananaJsonConverter());
_jsonOptions.Converters.Add(new FruitJsonConverter());
_jsonOptions.Converters.Add(new OrangeJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public partial class HostConfiguration
public HostConfiguration(IServiceCollection services)
{
_services = services;
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
_jsonOptions.Converters.Add(new ActivityJsonConverter());
_jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
_jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
Expand Down Expand Up @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services)
_jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
_jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
// Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter).
_jsonOptions.Converters.Add(new JsonStringEnumConverter());
JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
_services.AddSingleton(jsonSerializerOptionsProvider);
_services.AddSingleton<IApiFactory, ApiFactory>();
Expand Down
Loading
Loading