Fix some bugs

Author: hhvrc

Common/Geo/Alpha2CountryCodeAttribute.cs

@@ -8,17 +8,11 @@ public sealed class Alpha2CountryCodeAttribute : ValidationAttribute
     /// <inheritdoc/>
     protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
     {
-        if (value is null)
-            return new ValidationResult("Value is null");
-
         if (value is not string asString)
             return new ValidationResult("Input type must be string");
 
-        if (asString.Length != 2)
-            return new ValidationResult("Input string must be exactly 2 characters long");
-
-        if (asString[0] is not > 'A' and < 'Z' || asString[1] is not > 'A' and < 'Z')
-            return new ValidationResult("Characters must be uppercase");
+        if (asString is not [>= 'A' and <= 'Z', >= 'A' and <= 'Z'])
+            return new ValidationResult("Input string must be exactly 2 uppercase characters");
 
         if (!Alpha2CountryCode.TryParse(asString, out var countryCode))
             return new ValidationResult($"Failed to create {nameof(Alpha2CountryCode)}");

LiveControlGateway/LifetimeManager/HubLifetimeManager.cs

@@ -191,7 +191,7 @@ public async Task RemoveDeviceConnection(IHubController hubController)
     /// <exception cref="ArgumentNullException"></exception>
     public async Task<OneOf.OneOf<HubLifetime, NotFound, Busy>> AddLiveControlConnection(LiveControlController liveControlController)
     {
-        if (!liveControlController.HubId.HasValue) throw new ArgumentException(nameof(liveControlController), "LiveControlController does not have a hubId");
+        if (!liveControlController.HubId.HasValue) throw new ArgumentException("LiveControlController does not have a hubId", nameof(liveControlController));
 
         using (await _lifetimesLock.LockAsyncScoped())
         {