Skip to content

Commit ecd971e

Browse files
committed
moved OpenApiClient to OpenApi.Client
1 parent ba42b77 commit ecd971e

File tree

12 files changed

+34
-18
lines changed

12 files changed

+34
-18
lines changed

JsonApiDotNetCore.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi",
4848
EndProject
4949
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
5050
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApiClient", "src\JsonApiDotNetCore.OpenApiClient\JsonApiDotNetCore.OpenApiClient.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
51+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi.Client", "src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
5252
EndProject
5353
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCoreExampleClient", "src\Examples\JsonApiDotNetCoreExampleClient\JsonApiDotNetCoreExampleClient.csproj", "{7FC5DFA3-6F66-4FD8-820D-81E93856F252}"
5454
EndProject

docs/usage/toc.md

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

2525
# OpenAPI
2626
## [API Description](openapi/api-description.md))
27-
## [Client Library](openapi/client-library.md))
27+
### [Client Library](openapi/client-library.md))
2828

2929
# Extensibility
3030
## [Layer Overview](extensibility/layer-overview.md)

src/Examples/JsonApiDotNetCoreExampleClient/GeneratedCode/ExampleApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using JsonApiDotNetCore.OpenApiClient;
1+
using JsonApiDotNetCore.OpenApi.Client;
22
using Newtonsoft.Json;
33

44
namespace JsonApiDotNetCoreExampleClient.GeneratedCode

src/Examples/JsonApiDotNetCoreExampleClient/GeneratedCode/IExampleApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using JsonApiDotNetCore.OpenApiClient;
1+
using JsonApiDotNetCore.OpenApi.Client;
22

33
namespace JsonApiDotNetCoreExampleClient.GeneratedCode
44
{

src/Examples/JsonApiDotNetCoreExampleClient/JsonApiDotNetCoreExampleClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\..\JsonApiDotNetCore.OpenApiClient\JsonApiDotNetCore.OpenApiClient.csproj" />
29+
<ProjectReference Include="..\..\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
3030
</ItemGroup>
3131
</Project>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using JetBrains.Annotations;
3+
4+
#pragma warning disable AV1008 // Class should not be static
5+
6+
namespace JsonApiDotNetCore.OpenApi.Client
7+
{
8+
internal static class ArgumentGuard
9+
{
10+
[AssertionMethod]
11+
[ContractAnnotation("value: null => halt")]
12+
public static void NotNull<T>([CanBeNull] [NoEnumeration] T value, [NotNull] [InvokerParameterName] string name)
13+
where T : class
14+
{
15+
if (value is null)
16+
{
17+
throw new ArgumentNullException(name);
18+
}
19+
}
20+
}
21+
}

src/JsonApiDotNetCore.OpenApiClient/IJsonApiClient.cs renamed to src/JsonApiDotNetCore.OpenApi.Client/IJsonApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Linq.Expressions;
33

4-
namespace JsonApiDotNetCore.OpenApiClient
4+
namespace JsonApiDotNetCore.OpenApi.Client
55
{
66
public interface IJsonApiClient
77
{

src/JsonApiDotNetCore.OpenApiClient/JsonApiClient.cs renamed to src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
using System.Linq.Expressions;
55
using System.Reflection;
66
using JetBrains.Annotations;
7-
using JsonApiDotNetCore.OpenApi;
87
using Newtonsoft.Json;
98
using Newtonsoft.Json.Serialization;
109

11-
namespace JsonApiDotNetCore.OpenApiClient
10+
namespace JsonApiDotNetCore.OpenApi.Client
1211
{
1312
/// <summary>
1413
/// Base class to inherit auto-generated client from. Enables to mark fields to be explicitly included in a request body, even if they are null or
@@ -116,7 +115,7 @@ public override bool CanConvert(Type objectType)
116115

117116
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
118117
{
119-
throw new UnreachableCodeException();
118+
throw new Exception("This code should not be reachable.");
120119
}
121120

122121
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -221,4 +220,4 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
221220
}
222221
}
223222
}
224-
}
223+
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<PropertyGroup>
99
<PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;openapi;swagger;client;nswag</PackageTags>
10-
<Description>Contains utility methods to enrich the usability of an OpenAPI generated client.</Description>
10+
<Description>Provides support for partial PATCH and partial POST requests for a C# client generated with NSwag.</Description>
1111
<Authors>json-api-dotnet</Authors>
1212
<PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -17,11 +17,6 @@
1717
<DebugType>embedded</DebugType>
1818
</PropertyGroup>
1919

20-
<ItemGroup>
21-
<ProjectReference Include="..\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
22-
<ProjectReference Include="..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
23-
</ItemGroup>
24-
2520
<ItemGroup>
2621
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
2722
<PrivateAssets>all</PrivateAssets>

test/OpenApiTests/ClientLibrary/GeneratedCode/IOpenApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using JsonApiDotNetCore.OpenApiClient;
1+
using JsonApiDotNetCore.OpenApi.Client;
22

33
namespace OpenApiTests.ClientLibrary.GeneratedCode
44
{

test/OpenApiTests/ClientLibrary/GeneratedCode/OpenApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using JsonApiDotNetCore.OpenApiClient;
1+
using JsonApiDotNetCore.OpenApi.Client;
22
using Newtonsoft.Json;
33

44
namespace OpenApiTests.ClientLibrary.GeneratedCode

test/OpenApiTests/OpenApiTests.csproj

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

66
<ItemGroup>
7+
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
78
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApiClient\JsonApiDotNetCore.OpenApiClient.csproj" />
89
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
910
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />

0 commit comments

Comments
 (0)