Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SchemaGenerator to fix #2514 and #2052 #2683

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update SchemaGenerator to fix #2514 and #2052 #2683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efba318
Update SchemaGenerator.cs
danielcrabtree Jul 15, 2023
4b43f4d
Update SchemaGenerator.cs
danielcrabtree Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 32 additions & 13 deletions src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs
View file
Open in desktop
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
Expand Down Expand Up @@ -196,7 +196,10 @@ private bool IsBaseTypeWithKnownTypesDefined(DataContract dataContract, out IEnu
{
OneOf = knownTypesDataContracts
.Select(allowedTypeDataContract => GenerateConcreteSchema(allowedTypeDataContract, schemaRepository))
.ToList()
.ToList(),
Discriminator = TryGetDiscriminatorFor(dataContract, schemaRepository, knownTypesDataContracts, out var discriminator)
? discriminator
: null
};
}

Expand Down Expand Up @@ -350,9 +353,9 @@ private OpenApiSchema CreateObjectSchema(DataContract dataContract, SchemaReposi

var applicableDataProperties = dataContract.ObjectProperties;

if (_generatorOptions.UseAllOfForInheritance || _generatorOptions.UseOneOfForPolymorphism)
if(_generatorOptions.UseAllOfForInheritance)
{
if (IsKnownSubType(dataContract, out var baseTypeDataContract))
if(IsKnownSubType(dataContract, out var baseTypeDataContract))
{
var baseTypeSchema = GenerateConcreteSchema(baseTypeDataContract, schemaRepository);

Expand All @@ -362,19 +365,35 @@ private OpenApiSchema CreateObjectSchema(DataContract dataContract, SchemaReposi
.Where(dataProperty => dataProperty.MemberInfo.DeclaringType == dataContract.UnderlyingType);
}

if (IsBaseTypeWithKnownTypesDefined(dataContract, out var knownTypesDataContracts))
if(_generatorOptions.UseOneOfForPolymorphism)
{
foreach (var knownTypeDataContract in knownTypesDataContracts)
if(IsBaseTypeWithKnownTypesDefined(dataContract, out var knownTypesDataContracts))
{
// Ensure schema is generated for all known types
GenerateConcreteSchema(knownTypeDataContract, schemaRepository);
foreach(var knownTypeDataContract in knownTypesDataContracts)
{
// Ensure schema is generated for all known types
GenerateConcreteSchema(knownTypeDataContract, schemaRepository);
}

if(TryGetDiscriminatorFor(dataContract, schemaRepository, knownTypesDataContracts, out var discriminator))
{
schema.Properties.Add(discriminator.PropertyName, new OpenApiSchema { Type = "string" });
schema.Required.Add(discriminator.PropertyName);
}
}

if (TryGetDiscriminatorFor(dataContract, schemaRepository, knownTypesDataContracts, out var discriminator))
}
}
else if(_generatorOptions.UseOneOfForPolymorphism)
{
if(IsKnownSubType(dataContract, out var baseTypeDataContract))
{
if(IsBaseTypeWithKnownTypesDefined(baseTypeDataContract, out var knownTypesDataContracts))
{
schema.Properties.Add(discriminator.PropertyName, new OpenApiSchema { Type = "string" });
schema.Required.Add(discriminator.PropertyName);
schema.Discriminator = discriminator;
if(TryGetDiscriminatorFor(baseTypeDataContract, schemaRepository, knownTypesDataContracts, out var discriminator))
{
schema.Properties.Add(discriminator.PropertyName, new OpenApiSchema { Type = "string" });
schema.Required.Add(discriminator.PropertyName);
}
}
}
}
Expand Down