Skip to content

Commit 24cba11

Browse files
committed
fix warnings
1 parent 0c5e193 commit 24cba11

5 files changed

Lines changed: 17 additions & 19 deletions

File tree

‎tests/Smdn.TPSmartHomeDevices.Tapo/Smdn.TPSmartHomeDevices.Tapo.Protocol/PseudoTapoDevice.KLAP.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ await request.InputStream.ReadToEndAsync().ConfigureAwait(false),
310310

311311
var requestJsonDocument = JsonDocument.Parse(session.DecryptionBuffer.WrittenMemory);
312312

313-
var contentEncoding = utf8nobom;
313+
var contentEncoding = Utf8NoBom;
314314
var responseString = JsonSerializer.Serialize(
315315
FuncGenerateKlapRequestResponse?.Invoke(session, requestJsonDocument, sequenceNumber.Value)
316316
);

‎tests/Smdn.TPSmartHomeDevices.Tapo/Smdn.TPSmartHomeDevices.Tapo.Protocol/PseudoTapoDevice.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public AuthorizedSession(string token, UnauthorizedSession session)
123123
}
124124
}
125125

126-
private static readonly Encoding utf8nobom = new UTF8Encoding(false);
126+
private static readonly Encoding Utf8NoBom = new UTF8Encoding(false);
127127

128128
private static string CreateEndPointHttpUrl(IPEndPoint endPoint)
129129
=> endPoint.AddressFamily == AddressFamily.InterNetworkV6
@@ -250,7 +250,7 @@ public EndPoint Start(
250250

251251
taskProcessListener = Task.Run(ProcessListenerAsync);
252252

253-
return EndPoint!;
253+
return EndPoint;
254254
}
255255

256256
public IDeviceEndPoint GetEndPoint()
@@ -269,7 +269,7 @@ private async Task ProcessListenerAsync()
269269
HttpListenerContext? context = null;
270270

271271
try {
272-
context = await listener!.GetContextAsync().ConfigureAwait(false);
272+
context = await listener.GetContextAsync().ConfigureAwait(false);
273273
}
274274
catch (ArgumentException) when (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
275275
return; // disposed
@@ -324,7 +324,7 @@ string content
324324
)
325325
{
326326
const string ContentType = "text/plain";
327-
var contentEncoding = utf8nobom;
327+
var contentEncoding = Utf8NoBom;
328328

329329
try {
330330
response.StatusCode = (int)statusCode;
@@ -581,7 +581,7 @@ private static async Task WriteJsonContentAsync<TResponseContent>(
581581
)
582582
{
583583
const string ContentType = "application/json";
584-
var contentEncoding = utf8nobom;
584+
var contentEncoding = Utf8NoBom;
585585

586586
try {
587587
response.StatusCode = (int)statusCode;
@@ -657,7 +657,7 @@ JsonDocument requestJsonDocument
657657

658658
var session = UnauthorizedSession.Create(
659659
state: State,
660-
remoteEndPoint: remoteEndPoint!,
660+
remoteEndPoint: remoteEndPoint,
661661
sessionId: sessionId,
662662
expiresOn: sessionExpiresOn,
663663
key: keyAndIv.AsSpan(0, 16).ToArray(),
@@ -731,7 +731,7 @@ ITapoPassThroughResponse passThroughResponse
731731
)
732732
{
733733
const string ContentType = "application/json";
734-
var contentEncoding = utf8nobom;
734+
var contentEncoding = Utf8NoBom;
735735

736736
try {
737737
response.StatusCode = (int)HttpStatusCode.OK;
@@ -759,9 +759,9 @@ ITapoPassThroughResponse passThroughResponse
759759
type: typeOfSecurePassThroughResponse,
760760
bindingAttr: BindingFlags.Instance | BindingFlags.Public,
761761
binder: null,
762-
args: new object[] { errorCode, passThroughResponse },
762+
args: [ errorCode, passThroughResponse ],
763763
culture: null
764-
)!;
764+
);
765765

766766
await JsonSerializer.SerializeAsync(
767767
utf8Json: buffer,

‎tests/Smdn.TPSmartHomeDevices.Tapo/Smdn.TPSmartHomeDevices.Tapo.Protocol/TapoClient.Authentication.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Linq;
88
using System.Net;
99
using System.Net.Sockets;
10-
using System.Runtime.InteropServices;
1110
using System.Security.Cryptography;
1211
using System.Text;
1312
using System.Text.Json;
@@ -184,7 +183,7 @@ public void AddCredential(ITapoCredentialIdentity identity, TapoCredential? cred
184183
if (!credentials.TryGetValue(identity, out var credential))
185184
throw new TapoCredentialNotFoundException();
186185

187-
return credential!;
186+
return credential;
188187
}
189188

190189
public ITapoCredential GetCredential(ITapoCredentialIdentity? identity)

‎tests/Smdn.TPSmartHomeDevices.Tapo/Smdn.TPSmartHomeDevices.Tapo.Protocol/TapoClient.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public void SetUp()
4141
);
4242
}
4343

44-
defaultCredentialProvider = services?.BuildServiceProvider()!.GetRequiredService<ITapoCredentialProvider>();
45-
defaultHttpClientFactory = services?.BuildServiceProvider()!.GetService<IHttpClientFactory>();
44+
defaultCredentialProvider = services?.BuildServiceProvider().GetRequiredService<ITapoCredentialProvider>();
45+
defaultHttpClientFactory = services?.BuildServiceProvider().GetService<IHttpClientFactory>();
4646

4747
var servicesForDefaultKlapCredentialProvider = new ServiceCollection();
4848

@@ -51,7 +51,7 @@ public void SetUp()
5151
password: "pass"
5252
);
5353

54-
defaultKlapCredentialProvider = servicesForDefaultKlapCredentialProvider.BuildServiceProvider()!.GetRequiredService<ITapoCredentialProvider>();
54+
defaultKlapCredentialProvider = servicesForDefaultKlapCredentialProvider.BuildServiceProvider().GetRequiredService<ITapoCredentialProvider>();
5555
}
5656

5757
[Test]

‎tests/Smdn.TPSmartHomeDevices.Tapo/Smdn.TPSmartHomeDevices.Tapo/TapoDevice.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Net.Http;
88
using System.Net.NetworkInformation;
99
using System.Net.Sockets;
10-
using System.Runtime.InteropServices;
1110
using System.Text;
1211
using System.Text.Json.Serialization;
1312
using System.Threading;
@@ -74,7 +73,7 @@ public void Create_WithCredentialProvider_ByICredentialProvider()
7473
() => {
7574
using var device = TapoDevice.Create(
7675
deviceEndPoint: new StaticDeviceEndPoint(new IPEndPoint(IPAddress.Loopback, 0)),
77-
credential: services?.BuildServiceProvider()!.GetRequiredService<ITapoCredentialProvider>()
76+
credential: services?.BuildServiceProvider().GetRequiredService<ITapoCredentialProvider>()
7877
);
7978
}
8079
);
@@ -166,7 +165,7 @@ public async Task Create_WithMacAddress_IServiceProvider()
166165
macAddress: PhysicalAddress.None,
167166
"user@mail.test",
168167
"password",
169-
serviceProvider: services!.BuildServiceProvider()
168+
serviceProvider: services.BuildServiceProvider()
170169
);
171170

172171
Assert.That(device.EndPoint, Is.Not.Null);
@@ -186,7 +185,7 @@ public void Create_WithMacAddress_IServiceProvider_IDeviceEndPointFactoryNotRegi
186185
macAddress: PhysicalAddress.None,
187186
"user@mail.test",
188187
"password",
189-
serviceProvider: services!.BuildServiceProvider()
188+
serviceProvider: services.BuildServiceProvider()
190189
)
191190
);
192191
}

0 commit comments

Comments
 (0)