Fixes some new analyzer warnings MS added

i8beef · May 27, 2023 · f45b883 · f45b883
1 parent caec413
commit f45b883
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/src/HomeAutio.Mqtt.GoogleHome.Tests/GoogleDeviceRepositoryTests.cs b/src/HomeAutio.Mqtt.GoogleHome.Tests/GoogleDeviceRepositoryTests.cs
@@ -55,7 +55,7 @@ public void CanAddItem()
             var device = DeviceTestData.FullDevice();
 
             var expectedAddedTopics = device.Traits
-                .SelectMany(trait => trait.State)
+                .SelectMany(trait => trait.State!)
                 .Where(x => x.Value.Topic != null)
                 .Select(x => x.Value.Topic);
 
@@ -86,13 +86,13 @@ public void CanUpdateItem()
             var device = DeviceTestData.FullDevice2();
 
             var expectedDeletedTopics = oldDevice.Traits
-                .SelectMany(trait => trait.State)
+                .SelectMany(trait => trait.State!)
                 .Where(x => x.Value.Topic != null)
                 .Select(x => x.Value.Topic)
                 .ToList();
 
             var expectedAddedTopics = device.Traits
-                .SelectMany(trait => trait.State)
+                .SelectMany(trait => trait.State!)
                 .Where(x => x.Value.Topic is not null)
                 .Select(x => x.Value.Topic);
 
@@ -130,7 +130,7 @@ public void CanDeleteItem()
             var repository = new GoogleDeviceRepository(_logMock.Object, _messageHubMock.Object, _testFilePath);
             var device = repository.FindById(DeviceTestData.FullDevice2().Id);
             var expectedDeletedTopics = device!.Traits
-                .SelectMany(trait => trait.State)
+                .SelectMany(trait => trait.State!)
                 .Where(x => x.Value.Topic != null)
                 .Select(x => x.Value.Topic);
 

diff --git a/src/HomeAutio.Mqtt.GoogleHome/GoogleDeviceRepository.cs b/src/HomeAutio.Mqtt.GoogleHome/GoogleDeviceRepository.cs
@@ -116,11 +116,7 @@ public IList<Device> GetAll()
         /// <inheritdoc />
         public Device GetDetached(string deviceId)
         {
-            var device = FindById(deviceId);
-            if (device is null)
-            {
-                throw new InvalidOperationException($"Device id {deviceId} not found");
-            }
+            var device = FindById(deviceId) ?? throw new InvalidOperationException($"Device id {deviceId} not found");
 
             return JsonConvert.DeserializeObject<Device>(JsonConvert.SerializeObject(device))!;
         }

diff --git a/src/HomeAutio.Mqtt.GoogleHome/GoogleHomeGraphClient.cs b/src/HomeAutio.Mqtt.GoogleHome/GoogleHomeGraphClient.cs
@@ -216,11 +216,7 @@ private async Task<AccessTokenResponse> GetAccessToken()
             response.EnsureSuccessStatusCode();
 
             var content = await response.Content.ReadAsStringAsync();
-            var accessToken = JsonConvert.DeserializeObject<AccessTokenResponse>(content);
-            if (accessToken is null)
-            {
-                throw new GoogleHomeGraphAuthException($"Received malformed access token");
-            }
+            var accessToken = JsonConvert.DeserializeObject<AccessTokenResponse>(content) ?? throw new GoogleHomeGraphAuthException($"Received malformed access token");
 
             _log.LogDebug("Received access token");