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

Grammatical correction of some comments #2768

Merged
merged 4 commits into from
Apr 14, 2024
Merged

Grammatical correction of some comments #2768

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
762fb36
Grammatical correction of some comments #699
mokarchi Feb 24, 2024
5b564b2
Merge branch 'domaindrivendev:master' into master
mokarchi Apr 14, 2024
af38c9c
Update AnnotationsOperationFilter.cs
mokarchi Apr 14, 2024
d049731
Update AnnotationsSchemaFilter.cs
mokarchi Apr 14, 2024
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
10 changes: 5 additions & 5 deletions src/Swashbuckle.AspNetCore.Annotations/AnnotationsOperationFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;

namespace Swashbuckle.AspNetCore.Annotations
{
Expand All @@ -27,8 +27,8 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
}
#endif

// NOTE: When controller and action attributes are applicable, action attributes should take precendence.
// Hence why they're at the end of the list (i.e. last one wins).
// NOTE: When controller and action attributes are applicable, action attributes should take priority.
// Hence, why they're at the end of the list (i.e. last one wins).
// Distinct() is applied due to an ASP.NET Core issue: https://github.com/dotnet/aspnetcore/issues/34199.
var allAttributes = controllerAttributes
.Union(actionAttributes)
Expand Down
10 changes: 5 additions & 5 deletions src/Swashbuckle.AspNetCore.Annotations/AnnotationsSchemaFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;

namespace Swashbuckle.AspNetCore.Annotations
{
Expand All @@ -22,7 +22,7 @@ public void Apply(OpenApiSchema schema, SchemaFilterContext context)
ApplyTypeAnnotations(schema, context);

// NOTE: It's possible for both MemberInfo and ParameterInfo to have non-null values - i.e. when the schema is for a property
// within a class that is bound to a parameter. In this case, the MemberInfo should take precendence.
// within a class that is bound to a parameter. In this case, the MemberInfo should take precedence.

if (context.MemberInfo != null)
{
Expand Down