Skip to content

Commit f4cd2a3

Browse files
committed
review feedback
1 parent cf699c9 commit f4cd2a3

12 files changed

+15
-17
lines changed

JsonApiDotNetCore.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiDbContextTests", "test
4444
EndProject
4545
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBuildingBlocks", "test\TestBuildingBlocks\TestBuildingBlocks.csproj", "{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}"
4646
EndProject
47-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApi", "src\OpenApi\OpenApi.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
47+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi", "src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
4848
EndProject
4949
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
5050
EndProject

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ for:
3636
- image: Visual Studio 2019
3737
services:
3838
- postgresql101
39-
# REF: https://github.com/docascode/docfx-seed/blob/master/appveyor.yml
39+
# This ensures the base branch is loaded which is required for regitlint to run.
4040
clone_script:
41-
# This ensures the base branch is loaded which is required for regitlint to run.
4241
- ps: |
4342
git clone --branch=$env:APPVEYOR_REPO_BRANCH git@github.com:$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER
4443
git fetch -q origin +refs/pull/$env:APPVEYOR_PULL_REQUEST_NUMBER/merge:
4544
git checkout -qf FETCH_HEAD
45+
# REF: https://github.com/docascode/docfx-seed/blob/master/appveyor.yml
4646
before_build:
4747
- pwsh: |
4848
if (-Not $env:APPVEYOR_PULL_REQUEST_TITLE) {

src/OpenApi/OpenApi.csproj renamed to src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)"/>
7+
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
88
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleVersion)" />
99
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="$(SwashbuckleVersion)" />
1010
</ItemGroup>

src/OpenApi/OpenApiEndpointConvention.cs renamed to src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using System.Linq;
2-
using JsonApiDotNetCore;
32
using Microsoft.AspNetCore.Mvc.ApplicationModels;
43
using Microsoft.AspNetCore.Mvc.Routing;
54

6-
namespace OpenApi
5+
namespace JsonApiDotNetCore.OpenApi
76
{
87
internal sealed class OpenApiEndpointConvention : IActionModelConvention
98
{

src/OpenApi/ServiceCollectionExtensions.cs renamed to src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using System;
2-
using JsonApiDotNetCore;
32
using Microsoft.Extensions.DependencyInjection;
43
using Swashbuckle.AspNetCore.SwaggerGen;
54

6-
namespace OpenApi
5+
namespace JsonApiDotNetCore.OpenApi
76
{
87
public static class ServiceCollectionExtensions
98
{

src/JsonApiDotNetCore/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Runtime.CompilerServices;
22

3-
[assembly: InternalsVisibleTo("OpenApi")]
3+
[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi")]
44
[assembly: InternalsVisibleTo("Benchmarks")]
55
[assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")]
66
[assembly: InternalsVisibleTo("UnitTests")]

test/OpenApiTests/Airplane.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace OpenApiTests
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10-
public sealed class Airplane : Identifiable<int>
10+
public sealed class Airplane : Identifiable
1111
{
1212
[Attr]
1313
public int SeatingCapacity { get; set; }

test/OpenApiTests/AirplanesController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace OpenApiTests
77
{
8-
public sealed class AirplanesController : JsonApiController<Airplane, int>
8+
public sealed class AirplanesController : JsonApiController<Airplane>
99
{
1010
public AirplanesController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Airplane, int> resourceService)
1111
: base(options, loggerFactory, resourceService)

test/OpenApiTests/Flight.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
namespace OpenApiTests
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9-
public sealed class Flight : Identifiable<int>
9+
public sealed class Flight : Identifiable
1010
{
1111
[Attr]
1212
public string Destination { get; set; }
1313

1414
[Attr]
15-
public DateTimeOffset PlannedDeparture { get; set; }
15+
public DateTimeOffset DepartsAt { get; set; }
1616
}
1717
}

test/OpenApiTests/FlightsController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace OpenApiTests
77
{
8-
public sealed class FlightsController : JsonApiController<Flight, int>
8+
public sealed class FlightsController : JsonApiController<Flight>
99
{
10-
public FlightsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Flight, int> resourceService)
10+
public FlightsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IResourceService<Flight> resourceService)
1111
: base(options, loggerFactory, resourceService)
1212
{
1313
}

test/OpenApiTests/OpenApiStartup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using JsonApiDotNetCore.Configuration;
2+
using JsonApiDotNetCore.OpenApi;
23
using Microsoft.AspNetCore.Builder;
34
using Microsoft.AspNetCore.Hosting;
45
using Microsoft.EntityFrameworkCore;
56
using Microsoft.Extensions.DependencyInjection;
67
using Microsoft.Extensions.Logging;
78
using Microsoft.OpenApi.Models;
8-
using OpenApi;
99
using TestBuildingBlocks;
1010

1111
namespace OpenApiTests

test/OpenApiTests/OpenApiTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
14-
<ProjectReference Include="..\..\src\OpenApi\OpenApi.csproj" />
14+
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
1515
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
1616
</ItemGroup>
1717

0 commit comments

Comments
 (0)