Skip to content

Commit 55b737e

Browse files
authored
chore: Remove redundant null check covered by QueryString (#41)
1 parent f06216c commit 55b737e

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

src/Docker.DotNet/Endpoints/ContainerOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public Task RenameContainerAsync(string id, ContainerRenameParameters parameters
264264
throw new ArgumentNullException(nameof(id));
265265
}
266266

267-
var queryParameters = new QueryString<ContainerRenameParameters>(parameters ?? throw new ArgumentNullException(nameof(parameters)));
267+
var queryParameters = new QueryString<ContainerRenameParameters>(parameters);
268268
return _client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/rename", queryParameters, cancellationToken);
269269
}
270270

src/Docker.DotNet/Endpoints/SwarmOperations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ async Task<ServiceUpdateResponse> ISwarmOperations.UpdateServiceAsync(string id,
176176

177177
async Task ISwarmOperations.UpdateSwarmAsync(SwarmUpdateParameters parameters, CancellationToken cancellationToken)
178178
{
179-
var query = new QueryString<SwarmUpdateParameters>(parameters ?? throw new ArgumentNullException(nameof(parameters)));
179+
var query = new QueryString<SwarmUpdateParameters>(parameters);
180180
var body = new JsonRequestContent<Spec>(parameters.Spec, DockerClient.JsonSerializer);
181181
await _client.MakeRequestAsync(
182182
new ApiResponseErrorHandlingDelegate[]

src/Docker.DotNet/JsonRequestContent.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace Docker.DotNet;
22

3-
internal class JsonRequestContent<T> : IRequestContent
4-
where T : class
3+
internal class JsonRequestContent<T> : IRequestContent where T : class
54
{
65
private readonly T _value;
76
private readonly JsonSerializer _serializer;

src/Docker.DotNet/QueryString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Docker.DotNet;
22

3-
internal class QueryString<T> : IQueryString
3+
internal class QueryString<T> : IQueryString where T : class
44
{
55
private T Object { get; }
66

test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<Using Include="System.Collections.Generic" />
2323
<Using Include="System.Diagnostics" />
2424
<Using Include="System.Linq" />
25+
<Using Include="System.Net.Http" />
2526
<Using Include="System.Reflection" />
2627
<Using Include="System.Text" />
2728
<Using Include="System.Threading" />
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using System.Net.Http;
2-
31
namespace Docker.DotNet.Tests;
42

53
public sealed class JsonRequestContentTests
@@ -13,15 +11,15 @@ public void Constructor_ThrowsArgumentNullException_WhenValueIsNull()
1311
[Fact]
1412
public void Constructor_ThrowsArgumentNullException_WhenSerializerIsNull()
1513
{
16-
Assert.Throws<ArgumentNullException>(() => new JsonRequestContent<object>(new(), null));
14+
Assert.Throws<ArgumentNullException>(() => new JsonRequestContent<object>(new object(), null));
1715
}
1816

1917
[Fact]
2018
public async Task GetContent_Succeeds_WhenValueAndSerializerAreValid()
2119
{
22-
JsonRequestContent<int[]> content = new([1], JsonSerializer.Instance);
23-
using HttpContent httpContent = content.GetContent();
24-
string jsonString = await httpContent.ReadAsStringAsync();
20+
var content = new JsonRequestContent<int[]>(new[] { 1 }, JsonSerializer.Instance);
21+
using var httpContent = content.GetContent();
22+
var jsonString = await httpContent.ReadAsStringAsync();
2523
Assert.Equal("[1]", jsonString);
2624
}
27-
}
25+
}

0 commit comments

Comments
 (0)