Skip to content

Commit 0e82d2a

Browse files
committed
Fixes after merging v5 into openapi branch
1 parent 8ac90a2 commit 0e82d2a

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>

src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDe
7272
}
7373
case PrimaryRequestMetadata primaryMetadata:
7474
{
75-
UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType);
75+
UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType, null);
7676
return Array.Empty<ActionDescriptor>();
7777
}
7878
case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
@@ -140,7 +140,7 @@ private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndp
140140
return expansion;
141141
}
142142

143-
private static void UpdateBodyParameterDescriptor(ActionDescriptor endpoint, Type documentType, string? parameterName = null)
143+
private static void UpdateBodyParameterDescriptor(ActionDescriptor endpoint, Type documentType, string? parameterName)
144144
{
145145
ControllerParameterDescriptor? requestBodyDescriptor = endpoint.GetBodyParameterDescriptor();
146146

src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
35+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
</PackageReference>

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/CachingSwaggerGenerator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using Swashbuckle.AspNetCore.Swagger;
44
using Swashbuckle.AspNetCore.SwaggerGen;
55

6+
#pragma warning disable AV1553 // Do not use optional parameters with default value null for strings, collections or tasks
7+
68
namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
79

810
/// <summary>

test/OpenApiTests/OpenApiStartup.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using JsonApiDotNetCore.Configuration;
22
using JsonApiDotNetCore.OpenApi;
33
using Microsoft.AspNetCore.Builder;
4-
using Microsoft.AspNetCore.Hosting;
54
using Microsoft.EntityFrameworkCore;
65
using Microsoft.Extensions.DependencyInjection;
7-
using Microsoft.Extensions.Logging;
86
using TestBuildingBlocks;
97

108
namespace OpenApiTests;
@@ -21,7 +19,7 @@ public override void ConfigureServices(IServiceCollection services)
2119
services.AddOpenApi(mvcBuilder);
2220
}
2321

24-
public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
22+
public override void Configure(IApplicationBuilder app)
2523
{
2624
app.UseRouting();
2725
app.UseJsonApi();

0 commit comments

Comments
 (0)