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

Feature/#156 list of recursive models #233

Merged
merged 3 commits into from
Sep 17, 2021
Merged

Feature/#156 list of recursive models #233

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf7087a
fix: listobjectypevisitor should not revisit visited types
tsolbjor Sep 8, 2021
ccd9616
revert formatting
tsolbjor Sep 8, 2021
31704b8
DictionaryObjectTypeVisitor follow the same pattern as ListObjectType…
tsolbjor Sep 14, 2021
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
2 changes: 2 additions & 0 deletions samples/Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models/DummyResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,7 @@ public class DummyResponseModel
public DummySubResponseModel SubResponse2 { get; set; }

public DummyGenericModel<DummyModel> DummyGenericDummyModel { get; set; }

public List<DummyResponseModel> Children { get; set; }
tsolbjor marked this conversation as resolved.
Show resolved Hide resolved
}
}
21 changes: 15 additions & 6 deletions src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/ListObjectTypeVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Visitors
/// </summary>
public class ListObjectTypeVisitor : TypeVisitor
{
private readonly Dictionary<Type, OpenApiSchemaAcceptor> visitedTypes = new Dictionary<Type, OpenApiSchemaAcceptor>();

/// <inheritdoc />
public ListObjectTypeVisitor(VisitorCollection visitorCollection)
: base(visitorCollection)
Expand Down Expand Up @@ -54,14 +56,21 @@ public override void Visit(IAcceptor acceptor, KeyValuePair<string, Type> type,
};
var schemas = new Dictionary<string, OpenApiSchema>();

var subAcceptor = new OpenApiSchemaAcceptor()
OpenApiSchemaAcceptor subAcceptor;
if (!this.visitedTypes.ContainsKey(underlyingType))
{
Types = types,
RootSchemas = instance.RootSchemas,
Schemas = schemas,
};
subAcceptor = new OpenApiSchemaAcceptor()
{
Types = types, RootSchemas = instance.RootSchemas, Schemas = schemas,
};
this.visitedTypes.Add(underlyingType, subAcceptor);
subAcceptor.Accept(this.VisitorCollection, namingStrategy);

subAcceptor.Accept(this.VisitorCollection, namingStrategy);
}
else
{
subAcceptor = this.visitedTypes[underlyingType];
}
tsolbjor marked this conversation as resolved.
Show resolved Hide resolved

var items = subAcceptor.Schemas.First().Value;

Expand Down
1 change: 1 addition & 0 deletions ...Jobs.Extensions.OpenApi.TestApp/Microsoft.Azure.WebJobs.Extensions.OpenApi.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\samples\Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models\Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models.csproj" />
tsolbjor marked this conversation as resolved.
Show resolved Hide resolved
<ProjectReference Include="..\..\src\Microsoft.Azure.WebJobs.Extensions.OpenApi\Microsoft.Azure.WebJobs.Extensions.OpenApi.csproj" />
</ItemGroup>

Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeClassModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using System.Collections.Generic;

namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes
{
public class FakeClassModel
{
public int Number { get; set; }
public string Text { get; set; }
public List<FakeClassModel> Children { get; set; }
}
}
4 changes: 2 additions & 2 deletions test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/DocumentHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ public void GetOpenApiSchemas_Result_Should_Contain_Schema_For_Function_Classes(

schemas.Should().ContainKey("FakeClassModel");

schemas["FakeClassModel"].Properties.Count.Should().Be(2);
schemas["FakeClassModel"].Properties.Count.Should().Be(3);
schemas["FakeClassModel"].Type.Should().Be("object");

schemas.Should().ContainKey("FakeOtherClassModel");

schemas["FakeOtherClassModel"].Properties.Count.Should().Be(2);
schemas["FakeOtherClassModel"].Type.Should().Be("object");

schemas["FakeClassModel"].Properties.Count.Should().Be(2);
schemas["FakeClassModel"].Properties.Count.Should().Be(3);
schemas["FakeClassModel"].Type.Should().Be("object");

schemas.Should().ContainKey("FakeListModel");
Expand Down