Merge pull request #8503 from Bond-009/ThrowIfNull

Emby.Dlna/ContentDirectory/ContentDirectoryService.cs

@@ -103,10 +103,7 @@ namespace Emby.Dlna.ContentDirectory
         /// <inheritdoc />
         public Task<ControlResponse> ProcessControlRequestAsync(ControlRequest request)
         {
-            if (request == null)
+            ArgumentNullException.ThrowIfNull(request);
-            {
-                throw new ArgumentNullException(nameof(request));
-            }
 
             var profile = _dlna.GetProfile(request.Headers) ?? _dlna.GetDefaultProfile();
 

Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -114,15 +114,9 @@ namespace Emby.Dlna.ContentDirectory
         /// <inheritdoc />
         protected override void WriteResult(string methodName, IReadOnlyDictionary<string, string> methodParams, XmlWriter xmlWriter)
         {
-            if (xmlWriter == null)
+            ArgumentNullException.ThrowIfNull(xmlWriter);
-            {
-                throw new ArgumentNullException(nameof(xmlWriter));
-            }
 
-            if (methodParams == null)
+            ArgumentNullException.ThrowIfNull(methodParams);
-            {
-                throw new ArgumentNullException(nameof(methodParams));
-            }
 
             const string DeviceId = "test";
 

Emby.Dlna/DlnaManager.cs

@@ -100,10 +100,7 @@ namespace Emby.Dlna
         /// <inheritdoc />
         public DeviceProfile? GetProfile(DeviceIdentification deviceInfo)
         {
-            if (deviceInfo == null)
+            ArgumentNullException.ThrowIfNull(deviceInfo);
-            {
-                throw new ArgumentNullException(nameof(deviceInfo));
-            }
 
             var profile = GetProfiles()
                 .FirstOrDefault(i => i.Identification != null && IsMatch(deviceInfo, i.Identification));
@@ -170,10 +167,7 @@ namespace Emby.Dlna
         /// <inheritdoc />
         public DeviceProfile? GetProfile(IHeaderDictionary headers)
         {
-            if (headers == null)
+            ArgumentNullException.ThrowIfNull(headers);
-            {
-                throw new ArgumentNullException(nameof(headers));
-            }
 
             var profile = GetProfiles().FirstOrDefault(i => i.Identification != null && IsMatch(headers, i.Identification));
             if (profile == null)

Emby.Dlna/PlayTo/Device.cs

@@ -931,10 +931,7 @@ namespace Emby.Dlna.PlayTo
 
         private static UBaseObject CreateUBaseObject(XElement container, string trackUri)
         {
-            if (container == null)
+            ArgumentNullException.ThrowIfNull(container);
-            {
-                throw new ArgumentNullException(nameof(container));
-            }
 
             var url = container.GetValue(UPnpNamespaces.Res);
 
@@ -958,10 +955,7 @@ namespace Emby.Dlna.PlayTo
 
         private static string[] GetProtocolInfo(XElement container)
         {
-            if (container == null)
+            ArgumentNullException.ThrowIfNull(container);
-            {
-                throw new ArgumentNullException(nameof(container));
-            }
 
             var resElement = container.Element(UPnpNamespaces.Res);
 
@@ -1183,10 +1177,7 @@ namespace Emby.Dlna.PlayTo
 #nullable enable
         private static DeviceIcon CreateIcon(XElement element)
         {
-            if (element == null)
+            ArgumentNullException.ThrowIfNull(element);
-            {
-                throw new ArgumentNullException(nameof(element));
-            }
 
             var width = element.GetDescendantValue(UPnpNamespaces.Ud.GetName("width"));
             var height = element.GetDescendantValue(UPnpNamespaces.Ud.GetName("height"));

Emby.Dlna/PlayTo/TransportCommands.cs

@@ -61,10 +61,7 @@ namespace Emby.Dlna.PlayTo
 
         private static Argument ArgumentFromXml(XElement container)
         {
-            if (container == null)
+            ArgumentNullException.ThrowIfNull(container);
-            {
-                throw new ArgumentNullException(nameof(container));
-            }
 
             return new Argument
             {

Emby.Dlna/PlayTo/UpnpContainer.cs

@@ -10,10 +10,7 @@ namespace Emby.Dlna.PlayTo
     {
         public static UBaseObject Create(XElement container)
         {
-            if (container == null)
+            ArgumentNullException.ThrowIfNull(container);
-            {
-                throw new ArgumentNullException(nameof(container));
-            }
 
             return new UBaseObject
             {

Emby.Dlna/PlayTo/uBaseObject.cs

@@ -54,10 +54,7 @@ namespace Emby.Dlna.PlayTo
 
         public bool Equals(UBaseObject obj)
         {
-            if (obj == null)
+            ArgumentNullException.ThrowIfNull(obj);
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
 
             return string.Equals(Id, obj.Id, StringComparison.Ordinal);
         }

Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs

@@ -210,10 +210,7 @@ namespace Emby.Server.Implementations.AppBase
         /// <exception cref="ArgumentNullException"><c>newConfiguration</c> is <c>null</c>.</exception>
         public virtual void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
         {
-            if (newConfiguration == null)
+            ArgumentNullException.ThrowIfNull(newConfiguration);
-            {
-                throw new ArgumentNullException(nameof(newConfiguration));
-            }
 
             ValidateCachePath(newConfiguration);
 

Emby.Server.Implementations/Channels/ChannelManager.cs

@@ -1188,10 +1188,7 @@ namespace Emby.Server.Implementations.Channels
 
         internal IChannel GetChannelProvider(Channel channel)
         {
-            if (channel == null)
+            ArgumentNullException.ThrowIfNull(channel);
-            {
-                throw new ArgumentNullException(nameof(channel));
-            }
 
             var result = GetAllChannels()
                 .FirstOrDefault(i => GetInternalChannelId(i.Name).Equals(channel.ChannelId) || string.Equals(i.Name, channel.Name, StringComparison.OrdinalIgnoreCase));

Emby.Server.Implementations/Data/SqliteExtensions.cs

@@ -54,10 +54,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void RunQueries(this SQLiteDatabaseConnection connection, string[] queries)
         {
-            if (queries == null)
+            ArgumentNullException.ThrowIfNull(queries);
-            {
-                throw new ArgumentNullException(nameof(queries));
-            }
 
             connection.RunInTransaction(conn =>
             {

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -583,10 +583,7 @@ namespace Emby.Server.Implementations.Data
 
         public void SaveImages(BaseItem item)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             CheckDisposed();
 
@@ -617,10 +614,7 @@ namespace Emby.Server.Implementations.Data
         /// </exception>
         public void SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken)
         {
-            if (items == null)
+            ArgumentNullException.ThrowIfNull(items);
-            {
-                throw new ArgumentNullException(nameof(items));
-            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -2085,10 +2079,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException(nameof(id));
             }
 
-            if (chapters == null)
+            ArgumentNullException.ThrowIfNull(chapters);
-            {
-                throw new ArgumentNullException(nameof(chapters));
-            }
 
             var idBlob = id.ToByteArray();
 
@@ -2557,10 +2548,7 @@ namespace Emby.Server.Implementations.Data
 
         public int GetCount(InternalItemsQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -2613,10 +2601,7 @@ namespace Emby.Server.Implementations.Data
 
         public List<BaseItem> GetItemList(InternalItemsQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -2794,10 +2779,7 @@ namespace Emby.Server.Implementations.Data
 
         public QueryResult<BaseItem> GetItems(InternalItemsQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -3174,10 +3156,7 @@ namespace Emby.Server.Implementations.Data
 
         public List<Guid> GetItemIdsList(InternalItemsQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -4837,10 +4816,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
         public List<string> GetPeopleNames(InternalPeopleQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -4880,10 +4856,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
         public List<PersonInfo> GetPeople(InternalPeopleQuery query)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             CheckDisposed();
 
@@ -4999,10 +4972,7 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentNullException(nameof(itemId));
             }
 
-            if (ancestorIds == null)
+            ArgumentNullException.ThrowIfNull(ancestorIds);
-            {
-                throw new ArgumentNullException(nameof(ancestorIds));
-            }
 
             CheckDisposed();
 
@@ -5175,10 +5145,7 @@ AND Type = @InternalPersonType)");
 
         private QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType)
         {
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             if (!query.Limit.HasValue)
             {
@@ -5531,10 +5498,7 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentNullException(nameof(itemId));
             }
 
-            if (values == null)
+            ArgumentNullException.ThrowIfNull(values);
-            {
-                throw new ArgumentNullException(nameof(values));
-            }
 
             CheckDisposed();
 
@@ -5607,10 +5571,7 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentNullException(nameof(itemId));
             }
 
-            if (people == null)
+            ArgumentNullException.ThrowIfNull(people);
-            {
-                throw new ArgumentNullException(nameof(people));
-            }
 
             CheckDisposed();
 
@@ -5710,10 +5671,7 @@ AND Type = @InternalPersonType)");
         {
             CheckDisposed();
 
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             var cmdText = _mediaStreamSaveColumnsSelectQuery;
 
@@ -5766,10 +5724,7 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentNullException(nameof(id));
             }
 
-            if (streams == null)
+            ArgumentNullException.ThrowIfNull(streams);
-            {
-                throw new ArgumentNullException(nameof(streams));
-            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -6107,10 +6062,7 @@ AND Type = @InternalPersonType)");
         {
             CheckDisposed();
 
-            if (query == null)
+            ArgumentNullException.ThrowIfNull(query);
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
 
             var cmdText = _mediaAttachmentSaveColumnsSelectQuery;
 
@@ -6152,10 +6104,7 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentException("Guid can't be empty.", nameof(id));
             }
 
-            if (attachments == null)
+            ArgumentNullException.ThrowIfNull(attachments);
-            {
-                throw new ArgumentNullException(nameof(attachments));
-            }
 
             cancellationToken.ThrowIfCancellationRequested();
 

Emby.Server.Implementations/Data/SqliteUserDataRepository.cs

@@ -133,10 +133,7 @@ namespace Emby.Server.Implementations.Data
         /// <inheritdoc />
         public void SaveUserData(long userId, string key, UserItemData userData, CancellationToken cancellationToken)
         {
-            if (userData == null)
+            ArgumentNullException.ThrowIfNull(userData);
-            {
-                throw new ArgumentNullException(nameof(userData));
-            }
 
             if (userId <= 0)
             {
@@ -154,10 +151,7 @@ namespace Emby.Server.Implementations.Data
         /// <inheritdoc />
         public void SaveAllUserData(long userId, UserItemData[] userData, CancellationToken cancellationToken)
         {
-            if (userData == null)
+            ArgumentNullException.ThrowIfNull(userData);
-            {
-                throw new ArgumentNullException(nameof(userData));
-            }
 
             if (userId <= 0)
             {
@@ -304,10 +298,7 @@ namespace Emby.Server.Implementations.Data
 
         public UserItemData GetUserData(long userId, List<string> keys)
         {
-            if (keys == null)
+            ArgumentNullException.ThrowIfNull(keys);
-            {
-                throw new ArgumentNullException(nameof(keys));
-            }
 
             if (keys.Count == 0)
             {

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -281,10 +281,7 @@ namespace Emby.Server.Implementations.Library
 
         public void RegisterItem(BaseItem item)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (item is IItemByName)
             {
@@ -311,10 +308,7 @@ namespace Emby.Server.Implementations.Library
 
         public void DeleteItem(BaseItem item, DeleteOptions options, bool notifyParentItem)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             var parent = item.GetOwner() ?? item.GetParent();
 
@@ -323,10 +317,7 @@ namespace Emby.Server.Implementations.Library
 
         public void DeleteItem(BaseItem item, DeleteOptions options, BaseItem parent, bool notifyParentItem)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (item.SourceType == SourceType.Channel)
             {
@@ -509,10 +500,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException(nameof(key));
             }
 
-            if (type == null)
+            ArgumentNullException.ThrowIfNull(type);
-            {
-                throw new ArgumentNullException(nameof(type));
-            }
 
             string programDataPath = _configurationManager.ApplicationPaths.ProgramDataPath;
             if (key.StartsWith(programDataPath, StringComparison.Ordinal))
@@ -544,10 +532,7 @@ namespace Emby.Server.Implementations.Library
             string collectionType = null,
             LibraryOptions libraryOptions = null)
         {
-            if (fileInfo == null)
+            ArgumentNullException.ThrowIfNull(fileInfo);
-            {
-                throw new ArgumentNullException(nameof(fileInfo));
-            }
 
             var fullPath = fileInfo.FullName;
 
@@ -1854,10 +1839,7 @@ namespace Emby.Server.Implementations.Library
         /// <inheritdoc />
         public async Task UpdateImagesAsync(BaseItem item, bool forceUpdate = false)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             var outdated = forceUpdate
                 ? item.ImageInfos.Where(i => i.Path != null).ToArray()
@@ -2296,10 +2278,7 @@ namespace Emby.Server.Implementations.Library
             string viewType,
             string sortName)
         {
-            if (parent == null)
+            ArgumentNullException.ThrowIfNull(parent);
-            {
-                throw new ArgumentNullException(nameof(parent));
-            }
 
             var name = parent.Name;
             var parentId = parent.Id;
@@ -2983,10 +2962,7 @@ namespace Emby.Server.Implementations.Library
 
         private void AddMediaPathInternal(string virtualFolderName, MediaPathInfo pathInfo, bool saveLibraryOptions)
         {
-            if (pathInfo == null)
+            ArgumentNullException.ThrowIfNull(pathInfo);
-            {
-                throw new ArgumentNullException(nameof(pathInfo));
-            }
 
             var path = pathInfo.Path;
 
@@ -3033,10 +3009,7 @@ namespace Emby.Server.Implementations.Library
 
         public void UpdateMediaPath(string virtualFolderName, MediaPathInfo mediaPath)
         {
-            if (mediaPath == null)
+            ArgumentNullException.ThrowIfNull(mediaPath);
-            {
-                throw new ArgumentNullException(nameof(mediaPath));
-            }
 
             var rootFolderPath = _configurationManager.ApplicationPaths.DefaultUserViewsPath;
             var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);

Emby.Server.Implementations/Library/MediaSourceManager.cs

@@ -322,10 +322,7 @@ namespace Emby.Server.Implementations.Library
 
         public List<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             var hasMediaSources = (IHasMediaSources)item;
 

Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs

@@ -91,10 +91,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
 
         internal static bool IsImageFile(string path, IImageProcessor imageProcessor)
         {
-            if (path == null)
+            ArgumentNullException.ThrowIfNull(path);
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
 
             var filename = Path.GetFileNameWithoutExtension(path);
 

Emby.Server.Implementations/Library/UserDataManager.cs

@@ -53,15 +53,9 @@ namespace Emby.Server.Implementations.Library
 
         public void SaveUserData(User user, BaseItem item, UserItemData userData, UserDataSaveReason reason, CancellationToken cancellationToken)
         {
-            if (userData == null)
+            ArgumentNullException.ThrowIfNull(userData);
-            {
-                throw new ArgumentNullException(nameof(userData));
-            }
 
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -194,10 +188,7 @@ namespace Emby.Server.Implementations.Library
         /// <exception cref="ArgumentNullException"><paramref name="data"/> is <c>null</c>.</exception>
         private UserItemDataDto GetUserItemDataDto(UserItemData data)
         {
-            if (data == null)
+            ArgumentNullException.ThrowIfNull(data);
-            {
-                throw new ArgumentNullException(nameof(data));
-            }
 
             return new UserItemDataDto
             {

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -1223,10 +1223,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private async Task RecordStream(TimerInfo timer, DateTime recordingEndDate, ActiveRecordingInfo activeRecordingInfo)
         {
-            if (timer == null)
+            ArgumentNullException.ThrowIfNull(timer);
-            {
-                throw new ArgumentNullException(nameof(timer));
-            }
 
             LiveTvProgram programInfo = null;
 
@@ -2347,10 +2344,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer)
         {
-            if (seriesTimer == null)
+            ArgumentNullException.ThrowIfNull(seriesTimer);
-            {
-                throw new ArgumentNullException(nameof(seriesTimer));
-            }
 
             var query = new InternalItemsQuery
             {

Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs

@@ -84,10 +84,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public virtual void Update(T item)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             lock (_fileDataLock)
             {
@@ -107,10 +104,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public virtual void Add(T item)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             lock (_fileDataLock)
             {

Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs

@@ -44,10 +44,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
         public async Task<Stream> GetListingsStream(TunerHostInfo info, CancellationToken cancellationToken)
         {
-            if (info == null)
+            ArgumentNullException.ThrowIfNull(info);
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
 
             if (!info.Url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
             {

Emby.Server.Implementations/Net/SocketFactory.cs

@@ -63,10 +63,7 @@ namespace Emby.Server.Implementations.Net
         /// <inheritdoc />
         public ISocket CreateUdpMulticastSocket(IPAddress ipAddress, int multicastTimeToLive, int localPort)
         {
-            if (ipAddress == null)
+            ArgumentNullException.ThrowIfNull(ipAddress);
-            {
-                throw new ArgumentNullException(nameof(ipAddress));
-            }
 
             if (multicastTimeToLive <= 0)
             {

Emby.Server.Implementations/Net/UdpSocket.cs

@@ -35,10 +35,7 @@ namespace Emby.Server.Implementations.Net
 
         public UdpSocket(Socket socket, int localPort, IPAddress ip)
         {
-            if (socket == null)
+            ArgumentNullException.ThrowIfNull(socket);
-            {
-                throw new ArgumentNullException(nameof(socket));
-            }
 
             _socket = socket;
             _localPort = localPort;
@@ -51,10 +48,7 @@ namespace Emby.Server.Implementations.Net
 
         public UdpSocket(Socket socket, IPEndPoint endPoint)
         {
-            if (socket == null)
+            ArgumentNullException.ThrowIfNull(socket);
-            {
-                throw new ArgumentNullException(nameof(socket));
-            }
 
             _socket = socket;
             _socket.Connect(endPoint);

Emby.Server.Implementations/Plugins/PluginManager.cs

@@ -234,10 +234,7 @@ namespace Emby.Server.Implementations.Plugins
         /// <returns>Outcome of the operation.</returns>
         public bool RemovePlugin(LocalPlugin plugin)
         {
-            if (plugin == null)
+            ArgumentNullException.ThrowIfNull(plugin);
-            {
-                throw new ArgumentNullException(nameof(plugin));
-            }
 
             if (DeletePlugin(plugin))
             {
@@ -288,10 +285,7 @@ namespace Emby.Server.Implementations.Plugins
         /// <param name="plugin">The <see cref="LocalPlugin"/> of the plug to disable.</param>
         public void EnablePlugin(LocalPlugin plugin)
         {
-            if (plugin == null)
+            ArgumentNullException.ThrowIfNull(plugin);
-            {
-                throw new ArgumentNullException(nameof(plugin));
-            }
 
             if (ChangePluginState(plugin, PluginStatus.Active))
             {
@@ -306,10 +300,7 @@ namespace Emby.Server.Implementations.Plugins
         /// <param name="plugin">The <see cref="LocalPlugin"/> of the plug to disable.</param>
         public void DisablePlugin(LocalPlugin plugin)
         {
-            if (plugin == null)
+            ArgumentNullException.ThrowIfNull(plugin);
-            {
-                throw new ArgumentNullException(nameof(plugin));
-            }
 
             // Update the manifest on disk
             if (ChangePluginState(plugin, PluginStatus.Disabled))
@@ -326,10 +317,7 @@ namespace Emby.Server.Implementations.Plugins
         public void FailPlugin(Assembly assembly)
         {
             // Only save if disabled.
-            if (assembly == null)
+            ArgumentNullException.ThrowIfNull(assembly);
-            {
-                throw new ArgumentNullException(nameof(assembly));
-            }
 
             var plugin = _plugins.FirstOrDefault(p => p.DllFiles.Contains(assembly.Location));
             if (plugin == null)

Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs

@@ -92,25 +92,13 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// </exception>
         public ScheduledTaskWorker(IScheduledTask scheduledTask, IApplicationPaths applicationPaths, ITaskManager taskManager, ILogger logger)
         {
-            if (scheduledTask == null)
+            ArgumentNullException.ThrowIfNull(scheduledTask);
-            {
-                throw new ArgumentNullException(nameof(scheduledTask));
-            }
 
-            if (applicationPaths == null)
+            ArgumentNullException.ThrowIfNull(applicationPaths);
-            {
-                throw new ArgumentNullException(nameof(applicationPaths));
-            }
 
-            if (taskManager == null)
+            ArgumentNullException.ThrowIfNull(taskManager);
-            {
-                throw new ArgumentNullException(nameof(taskManager));
-            }
 
-            if (logger == null)
+            ArgumentNullException.ThrowIfNull(logger);
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
 
             ScheduledTask = scheduledTask;
             _applicationPaths = applicationPaths;
@@ -249,10 +237,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             get => _triggers;
             set
             {
-                if (value == null)
+                ArgumentNullException.ThrowIfNull(value);
-                {
-                    throw new ArgumentNullException(nameof(value));
-                }
 
                 // Cleanup current triggers
                 if (_triggers != null)
@@ -281,10 +266,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
 
             set
             {
-                if (value == null)
+                ArgumentNullException.ThrowIfNull(value);
-                {
-                    throw new ArgumentNullException(nameof(value));
-                }
 
                 // This null check is not great, but is needed to handle bad user input, or user mucking with the config file incorrectly
                 var triggerList = value.Where(i => i != null).ToArray();

Emby.Server.Implementations/Session/SessionManager.cs

@@ -665,10 +665,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            if (info == null)
+            ArgumentNullException.ThrowIfNull(info);
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
 
             var session = GetSession(info.SessionId);
 
@@ -762,10 +759,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            if (info == null)
+            ArgumentNullException.ThrowIfNull(info);
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
 
             var session = GetSession(info.SessionId);
 
@@ -897,10 +891,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            if (info == null)
+            ArgumentNullException.ThrowIfNull(info);
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
 
             if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
             {
@@ -1341,15 +1332,9 @@ namespace Emby.Server.Implementations.Session
 
         private static void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
         {
-            if (session == null)
+            ArgumentNullException.ThrowIfNull(session);
-            {
-                throw new ArgumentNullException(nameof(session));
-            }
 
-            if (controllingSession == null)
+            ArgumentNullException.ThrowIfNull(controllingSession);
-            {
-                throw new ArgumentNullException(nameof(controllingSession));
-            }
         }
 
         /// <summary>
@@ -1688,10 +1673,7 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         private BaseItemDto GetItemInfo(BaseItem item, MediaSourceInfo mediaSource)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             var dtoOptions = _itemInfoDtoOptions;
 
@@ -1802,10 +1784,7 @@ namespace Emby.Server.Implementations.Session
         /// <inheritdoc />
         public Task<SessionInfo> GetSessionByAuthenticationToken(Device info, string deviceId, string remoteEndpoint, string appVersion)
         {
-            if (info == null)
+            ArgumentNullException.ThrowIfNull(info);
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
 
             var user = info.UserId.Equals(default)
                 ? null

Emby.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs

@@ -24,15 +24,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             var episode1 = x as Episode;
             var episode2 = y as Episode;

Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs

@@ -23,15 +23,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return (x.CommunityRating ?? 0).CompareTo(y.CommunityRating ?? 0);
         }

Emby.Server.Implementations/Sorting/DateCreatedComparer.cs

@@ -24,15 +24,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return DateTime.Compare(x.DateCreated, y.DateCreated);
         }

Emby.Server.Implementations/Sorting/IndexNumberComparer.cs

@@ -24,15 +24,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             if (!x.IndexNumber.HasValue && !y.IndexNumber.HasValue)
             {

Emby.Server.Implementations/Sorting/NameComparer.cs

@@ -24,15 +24,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return string.Compare(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
         }

Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs

@@ -31,15 +31,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             var levelX = string.IsNullOrEmpty(x.OfficialRating) ? 0 : _localization.GetRatingLevel(x.OfficialRating) ?? 0;
             var levelY = string.IsNullOrEmpty(y.OfficialRating) ? 0 : _localization.GetRatingLevel(y.OfficialRating) ?? 0;

Emby.Server.Implementations/Sorting/ParentIndexNumberComparer.cs

@@ -24,15 +24,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem? x, BaseItem? y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             if (!x.ParentIndexNumber.HasValue && !y.ParentIndexNumber.HasValue)
             {

Emby.Server.Implementations/Sorting/RuntimeComparer.cs

@@ -26,15 +26,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem x, BaseItem y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return (x.RunTimeTicks ?? 0).CompareTo(y.RunTimeTicks ?? 0);
         }

Emby.Server.Implementations/Sorting/SortNameComparer.cs

@@ -26,15 +26,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem x, BaseItem y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return string.Compare(x.SortName, y.SortName, StringComparison.OrdinalIgnoreCase);
         }

Emby.Server.Implementations/Sorting/StudioComparer.cs

@@ -26,15 +26,9 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem x, BaseItem y)
         {
-            if (x == null)
+            ArgumentNullException.ThrowIfNull(x);
-            {
-                throw new ArgumentNullException(nameof(x));
-            }
 
-            if (y == null)
+            ArgumentNullException.ThrowIfNull(y);
-            {
-                throw new ArgumentNullException(nameof(y));
-            }
 
             return AlphanumericComparator.CompareValues(x.Studios.FirstOrDefault(), y.Studios.FirstOrDefault());
         }

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -294,10 +294,7 @@ namespace Emby.Server.Implementations.Updates
         /// <inheritdoc />
         public async Task InstallPackage(InstallationInfo package, CancellationToken cancellationToken)
         {
-            if (package == null)
+            ArgumentNullException.ThrowIfNull(package);
-            {
-                throw new ArgumentNullException(nameof(package));
-            }
 
             var innerCancellationTokenSource = new CancellationTokenSource();
 

Jellyfin.Api/Attributes/HttpSubscribeAttribute.cs

@@ -25,6 +25,6 @@ namespace Jellyfin.Api.Attributes
         /// <param name="template">The route template. May not be null.</param>
         public HttpSubscribeAttribute(string template)
             : base(_supportedMethods, template)
-            => ArgumentNullException.ThrowIfNull(template, nameof(template));
+            => ArgumentNullException.ThrowIfNull(template);
     }
 }

Jellyfin.Api/Attributes/HttpUnsubscribeAttribute.cs

@@ -25,6 +25,6 @@ namespace Jellyfin.Api.Attributes
         /// <param name="template">The route template. May not be null.</param>
         public HttpUnsubscribeAttribute(string template)
             : base(_supportedMethods, template)
-            => ArgumentNullException.ThrowIfNull(template, nameof(template));
+            => ArgumentNullException.ThrowIfNull(template);
     }
 }

Jellyfin.Drawing.Skia/SkiaEncoder.cs

@@ -145,7 +145,7 @@ namespace Jellyfin.Drawing.Skia
         /// <exception cref="SkiaCodecException">The file at the specified path could not be used to generate a codec.</exception>
         public string GetImageBlurHash(int xComp, int yComp, string path)
         {
-            ArgumentNullException.ThrowIfNull(path, nameof(path));
+            ArgumentNullException.ThrowIfNull(path);
 
             if (path.Length == 0)
             {

Jellyfin.Drawing.Skia/StripCollageBuilder.cs

@@ -29,10 +29,7 @@ namespace Jellyfin.Drawing.Skia
         /// <returns>The image format.</returns>
         public static SKEncodedImageFormat GetEncodedFormat(string outputPath)
         {
-            if (outputPath == null)
+            ArgumentNullException.ThrowIfNull(outputPath);
-            {
-                throw new ArgumentNullException(nameof(outputPath));
-            }
 
             var ext = Path.GetExtension(outputPath);
 

Jellyfin.Networking/Manager/NetworkManager.cs

@@ -353,10 +353,7 @@ namespace Jellyfin.Networking.Manager
         public string GetBindInterface(IPObject source, out int? port)
         {
             port = null;
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
             // Do we have a source?
             bool haveSource = !source.Address.Equals(IPAddress.None);
@@ -476,10 +473,7 @@ namespace Jellyfin.Networking.Manager
         /// <inheritdoc/>
         public bool IsInLocalNetwork(IPAddress address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (address.Equals(IPAddress.None))
             {
@@ -499,10 +493,7 @@ namespace Jellyfin.Networking.Manager
         /// <inheritdoc/>
         public bool IsPrivateAddressRange(IPObject address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             // See conversation at https://github.com/jellyfin/jellyfin/pull/3515.
             if (TrustAllIP6Interfaces && address.AddressFamily == AddressFamily.InterNetworkV6)

Jellyfin.Server.Implementations/Devices/DeviceManager.cs

@@ -201,10 +201,7 @@ namespace Jellyfin.Server.Implementations.Devices
         /// <inheritdoc />
         public bool CanAccessDevice(User user, string deviceId)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             if (string.IsNullOrEmpty(deviceId))
             {

Jellyfin.Server.Implementations/Users/UserManager.cs

@@ -130,10 +130,7 @@ namespace Jellyfin.Server.Implementations.Users
         /// <inheritdoc/>
         public async Task RenameUser(User user, string newName)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             ThrowIfInvalidUsername(newName);
 
@@ -267,10 +264,7 @@ namespace Jellyfin.Server.Implementations.Users
         /// <inheritdoc/>
         public async Task ChangePassword(User user, string newPassword)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             await GetAuthenticationProvider(user).ChangePassword(user, newPassword).ConfigureAwait(false);
             await UpdateUserAsync(user).ConfigureAwait(false);

Jellyfin.Server/Infrastructure/SymlinkFollowingPhysicalFileResultExecutor.cs

@@ -69,8 +69,8 @@ namespace Jellyfin.Server.Infrastructure
         /// <inheritdoc />
         protected override Task WriteFileAsync(ActionContext context, PhysicalFileResult result, RangeItemHeaderValue? range, long rangeLength)
         {
-            ArgumentNullException.ThrowIfNull(context, nameof(context));
+            ArgumentNullException.ThrowIfNull(context);
-            ArgumentNullException.ThrowIfNull(result, nameof(result));
+            ArgumentNullException.ThrowIfNull(result);
 
             if (range != null && rangeLength == 0)
             {

MediaBrowser.Common/Net/IPNetAddress.cs

@@ -160,10 +160,7 @@ namespace MediaBrowser.Common.Net
         /// <inheritdoc/>
         public override bool Contains(IPAddress address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (address.IsIPv4MappedToIPv6)
             {

MediaBrowser.Common/Net/IPObject.cs

@@ -55,10 +55,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>IPAddress.</returns>
         public static (IPAddress Address, byte PrefixLength) NetworkAddressOf(IPAddress address, byte prefixLength)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -109,10 +106,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>True if it is.</returns>
         public static bool IsIP6(IPAddress address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -129,10 +123,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>True if it contains a private address.</returns>
         public static bool IsPrivateAddressRange(IPAddress address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (!address.Equals(IPAddress.None))
             {
@@ -179,10 +170,7 @@ namespace MediaBrowser.Common.Net
         /// </remarks>
         public static bool IsIPv6LinkLocal(IPAddress address)
         {
-            if (address == null)
+            ArgumentNullException.ThrowIfNull(address);
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -226,10 +214,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Byte CIDR representing the mask.</returns>
         public static byte MaskToCidr(IPAddress mask)
         {
-            if (mask == null)
+            ArgumentNullException.ThrowIfNull(mask);
-            {
-                throw new ArgumentNullException(nameof(mask));
-            }
 
             byte cidrnet = 0;
             if (!mask.Equals(IPAddress.Any))

MediaBrowser.Common/Net/NetworkExtensions.cs

@@ -61,10 +61,7 @@ namespace MediaBrowser.Common.Net
                 return false;
             }
 
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (item.IsIPv4MappedToIPv6)
             {
@@ -96,10 +93,7 @@ namespace MediaBrowser.Common.Net
                 return false;
             }
 
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             foreach (var i in source)
             {
@@ -153,10 +147,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Collection{IPObject} object containing the subnets.</returns>
         public static Collection<IPObject> AsNetworks(this Collection<IPObject> source)
         {
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
             Collection<IPObject> res = new Collection<IPObject>();
 
@@ -239,10 +230,7 @@ namespace MediaBrowser.Common.Net
                 return new Collection<IPObject>();
             }
 
-            if (target == null)
+            ArgumentNullException.ThrowIfNull(target);
-            {
-                throw new ArgumentNullException(nameof(target));
-            }
 
             Collection<IPObject> nc = new Collection<IPObject>();
 

MediaBrowser.Common/Plugins/BasePluginOfT.cs

@@ -164,10 +164,7 @@ namespace MediaBrowser.Common.Plugins
         /// <inheritdoc />
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)
         {
-            if (configuration == null)
+            ArgumentNullException.ThrowIfNull(configuration);
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
 
             Configuration = (TConfigurationType)configuration;
 

MediaBrowser.Controller/Entities/AggregateFolder.cs

@@ -171,10 +171,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="ArgumentNullException">Throws if child is null.</exception>
         public void AddVirtualChild(BaseItem child)
         {
-            if (child == null)
+            ArgumentNullException.ThrowIfNull(child);
-            {
-                throw new ArgumentNullException(nameof(child));
-            }
 
             _virtualChildren.Add(child);
         }

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -1101,10 +1101,7 @@ namespace MediaBrowser.Controller.Entities
 
         private MediaSourceInfo GetVersionInfo(bool enablePathSubstitution, BaseItem item, MediaSourceType type)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             var protocol = item.PathProtocol;
 
@@ -1544,10 +1541,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="ArgumentNullException">If user is null.</exception>
         public bool IsParentalAllowed(User user)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             if (!IsVisibleViaTags(user))
             {
@@ -1667,10 +1661,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="ArgumentNullException"><paramref name="user" /> is <c>null</c>.</exception>
         public virtual bool IsVisible(User user)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             return IsParentalAllowed(user);
         }
@@ -1842,10 +1833,7 @@ namespace MediaBrowser.Controller.Entities
             DateTime? datePlayed,
             bool resetPosition)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             var data = UserDataManager.GetUserData(user, this);
 
@@ -1876,10 +1864,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="ArgumentNullException">Throws if user is null.</exception>
         public virtual void MarkUnplayed(User user)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             var data = UserDataManager.GetUserData(user, this);
 
@@ -2110,10 +2095,7 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>Image index.</returns>
         public int GetImageIndex(ItemImageInfo image)
         {
-            if (image == null)
+            ArgumentNullException.ThrowIfNull(image);
-            {
-                throw new ArgumentNullException(nameof(image));
-            }
 
             if (image.Type == ImageType.Chapter)
             {
@@ -2320,10 +2302,7 @@ namespace MediaBrowser.Controller.Entities
 
         public virtual bool IsUnplayed(User user)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             var userdata = UserDataManager.GetUserData(user, this);
 

MediaBrowser.Controller/Entities/BaseItemExtensions.cs

@@ -71,15 +71,9 @@ namespace MediaBrowser.Controller.Entities
             where T : BaseItem
             where TU : BaseItem
         {
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
-            if (dest == null)
+            ArgumentNullException.ThrowIfNull(dest);
-            {
-                throw new ArgumentNullException(nameof(dest));
-            }
 
             var destProps = typeof(TU).GetProperties().Where(x => x.CanWrite).ToList();
 

MediaBrowser.Controller/Entities/Extensions.cs

@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="url">Trailer URL.</param>
         public static void AddTrailerUrl(this BaseItem item, string url)
         {
-            ArgumentNullException.ThrowIfNull(url, nameof(url));
+            ArgumentNullException.ThrowIfNull(url);
 
             if (url.Length == 0)
             {

MediaBrowser.Controller/Entities/Folder.cs

@@ -1023,10 +1023,7 @@ namespace MediaBrowser.Controller.Entities
             IServerConfigurationManager configurationManager,
             ICollectionManager collectionManager)
         {
-            if (items == null)
+            ArgumentNullException.ThrowIfNull(items);
-            {
-                throw new ArgumentNullException(nameof(items));
-            }
 
             if (CollapseBoxSetItems(query, queryParent, user, configurationManager))
             {
@@ -1273,20 +1270,14 @@ namespace MediaBrowser.Controller.Entities
 
         public List<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             return GetChildren(user, includeLinkedChildren, null);
         }
 
         public virtual List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             // the true root should return our users root folder children
             if (IsPhysicalRoot)
@@ -1367,10 +1358,7 @@ namespace MediaBrowser.Controller.Entities
 
         public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
-            if (user == null)
+            ArgumentNullException.ThrowIfNull(user);
-            {
-                throw new ArgumentNullException(nameof(user));
-            }
 
             var result = new Dictionary<Guid, BaseItem>();
 

MediaBrowser.Controller/Entities/PeopleHelper.cs

@@ -11,10 +11,7 @@ namespace MediaBrowser.Controller.Entities
     {
         public static void AddPerson(List<PersonInfo> people, PersonInfo person)
         {
-            if (person == null)
+            ArgumentNullException.ThrowIfNull(person);
-            {
-                throw new ArgumentNullException(nameof(person));
-            }
 
             if (string.IsNullOrEmpty(person.Name))
             {

MediaBrowser.Controller/IO/FileData.cs

@@ -40,10 +40,7 @@ namespace MediaBrowser.Controller.IO
                 throw new ArgumentNullException(nameof(path));
             }
 
-            if (args == null)
+            ArgumentNullException.ThrowIfNull(args);
-            {
-                throw new ArgumentNullException(nameof(args));
-            }
 
             var entries = directoryService.GetFileSystemEntries(path);
 

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -5105,15 +5105,9 @@ namespace MediaBrowser.Controller.MediaEncoding
             MediaSourceInfo mediaSource,
             string requestedUrl)
         {
-            if (state == null)
+            ArgumentNullException.ThrowIfNull(state);
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
 
-            if (mediaSource == null)
+            ArgumentNullException.ThrowIfNull(mediaSource);
-            {
-                throw new ArgumentNullException(nameof(mediaSource));
-            }
 
             var path = mediaSource.Path;
             var protocol = mediaSource.Protocol;

MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs

@@ -38,10 +38,7 @@ namespace MediaBrowser.Controller.Net
 
         protected BasePeriodicWebSocketListener(ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> logger)
         {
-            if (logger == null)
+            ArgumentNullException.ThrowIfNull(logger);
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
 
             Logger = logger;
         }
@@ -77,10 +74,7 @@ namespace MediaBrowser.Controller.Net
         /// <returns>Task.</returns>
         public Task ProcessMessageAsync(WebSocketMessageInfo message)
         {
-            if (message == null)
+            ArgumentNullException.ThrowIfNull(message);
-            {
-                throw new ArgumentNullException(nameof(message));
-            }
 
             if (message.MessageType == StartType)
             {

MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs

@@ -53,10 +53,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
         /// <exception cref="ArgumentNullException">Item is null.</exception>
         public void Fetch(MetadataResult<T> item, string metadataFile, CancellationToken cancellationToken)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (string.IsNullOrEmpty(metadataFile))
             {

MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs

@@ -52,10 +52,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
         /// <inheritdoc />
         public async Task<(MediaAttachment Attachment, Stream Stream)> GetAttachment(BaseItem item, string mediaSourceId, int attachmentStreamIndex, CancellationToken cancellationToken)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (string.IsNullOrWhiteSpace(mediaSourceId))
             {

MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs

@@ -15,10 +15,7 @@ namespace MediaBrowser.MediaEncoding.Probing
         /// <param name="result">The result.</param>
         public static void NormalizeFFProbeResult(InternalMediaInfoResult result)
         {
-            if (result == null)
+            ArgumentNullException.ThrowIfNull(result);
-            {
-                throw new ArgumentNullException(nameof(result));
-            }
 
             if (result.Format?.Tags != null)
             {

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -120,10 +120,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         async Task<Stream> ISubtitleEncoder.GetSubtitles(BaseItem item, string mediaSourceId, int subtitleStreamIndex, string outputFormat, long startTimeTicks, long endTimeTicks, bool preserveOriginalTimestamps, CancellationToken cancellationToken)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             if (string.IsNullOrWhiteSpace(mediaSourceId))
             {

MediaBrowser.Model/Cryptography/PasswordHash.cs

@@ -29,10 +29,7 @@ namespace MediaBrowser.Model.Cryptography
 
         public PasswordHash(string id, byte[] hash, byte[] salt, Dictionary<string, string> parameters)
         {
-            if (id == null)
+            ArgumentNullException.ThrowIfNull(id);
-            {
-                throw new ArgumentNullException(nameof(id));
-            }
 
             if (id.Length == 0)
             {

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -565,10 +565,7 @@ namespace MediaBrowser.Model.Dlna
 
         private StreamInfo BuildVideoItem(MediaSourceInfo item, VideoOptions options)
         {
-            if (item == null)
+            ArgumentNullException.ThrowIfNull(item);
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
 
             StreamInfo playlistItem = new StreamInfo
             {

MediaBrowser.Model/Entities/ProviderIdsExtensions.cs

@@ -28,10 +28,7 @@ namespace MediaBrowser.Model.Entities
         /// <returns><c>true</c> if a provider id with the given name was found; otherwise <c>false</c>.</returns>
         public static bool HasProviderId(this IHasProviderIds instance, string name)
         {
-            if (instance == null)
+            ArgumentNullException.ThrowIfNull(instance);
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
 
             return instance.TryGetProviderId(name, out _);
         }
@@ -56,10 +53,7 @@ namespace MediaBrowser.Model.Entities
         /// <returns><c>true</c> if a provider id with the given name was found; otherwise <c>false</c>.</returns>
         public static bool TryGetProviderId(this IHasProviderIds instance, string name, [NotNullWhen(true)] out string? id)
         {
-            if (instance == null)
+            ArgumentNullException.ThrowIfNull(instance);
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
 
             if (instance.ProviderIds == null)
             {
@@ -121,10 +115,7 @@ namespace MediaBrowser.Model.Entities
         /// <param name="value">The value.</param>
         public static void SetProviderId(this IHasProviderIds instance, string name, string? value)
         {
-            if (instance == null)
+            ArgumentNullException.ThrowIfNull(instance);
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
 
             // If it's null remove the key from the dictionary
             if (string.IsNullOrEmpty(value))

src/Jellyfin.Extensions/EnumerableExtensions.cs

@@ -18,10 +18,7 @@ namespace Jellyfin.Extensions
         /// <exception cref="ArgumentNullException">The source is null.</exception>
         public static bool Contains(this IEnumerable<string> source, ReadOnlySpan<char> value, StringComparison stringComparison)
         {
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
             if (source is IList<string> list)
             {

tests/Jellyfin.Networking.Tests/NetworkParseTests.cs

@@ -103,10 +103,7 @@ namespace Jellyfin.Networking.Tests
             "[192.158.0.0/16,192.0.0.0/8]")]
         public void TestCollections(string settings, string result1, string result2, string result3, string result4, string result5)
         {
-            if (settings == null)
+            ArgumentNullException.ThrowIfNull(settings);
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
 
             var conf = new NetworkConfiguration()
             {
@@ -155,20 +152,11 @@ namespace Jellyfin.Networking.Tests
         [InlineData("127.0.0.1", "127.0.0.1/8", "[127.0.0.1/32]")]
         public void UnionCheck(string settings, string compare, string result)
         {
-            if (settings == null)
+            ArgumentNullException.ThrowIfNull(settings);
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
 
-            if (compare == null)
+            ArgumentNullException.ThrowIfNull(compare);
-            {
-                throw new ArgumentNullException(nameof(compare));
-            }
 
-            if (result == null)
+            ArgumentNullException.ThrowIfNull(result);
-            {
-                throw new ArgumentNullException(nameof(result));
-            }
 
             var conf = new NetworkConfiguration()
             {
@@ -264,20 +252,11 @@ namespace Jellyfin.Networking.Tests
 
         public void TestCollectionEquality(string source, string dest, string result)
         {
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
-            if (dest == null)
+            ArgumentNullException.ThrowIfNull(dest);
-            {
-                throw new ArgumentNullException(nameof(dest));
-            }
 
-            if (result == null)
+            ArgumentNullException.ThrowIfNull(result);
-            {
-                throw new ArgumentNullException(nameof(result));
-            }
 
             var conf = new NetworkConfiguration()
             {
@@ -331,20 +310,11 @@ namespace Jellyfin.Networking.Tests
         [InlineData("", "", false, "eth16")]
         public void TestBindInterfaces(string source, string bindAddresses, bool ipv6enabled, string result)
         {
-            if (source == null)
+            ArgumentNullException.ThrowIfNull(source);
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
 
-            if (bindAddresses == null)
+            ArgumentNullException.ThrowIfNull(bindAddresses);
-            {
-                throw new ArgumentNullException(nameof(bindAddresses));
-            }
 
-            if (result == null)
+            ArgumentNullException.ThrowIfNull(result);
-            {
-                throw new ArgumentNullException(nameof(result));
-            }
 
             var conf = new NetworkConfiguration()
             {
@@ -403,15 +373,9 @@ namespace Jellyfin.Networking.Tests
         [InlineData("192.168.1.1", "192.168.1.0/24", "", false, "eth16=http://helloworld.com", "http://helloworld.com")]
         public void TestBindInterfaceOverrides(string source, string lan, string bindAddresses, bool ipv6enabled, string publishedServers, string result)
         {
-            if (lan == null)
+            ArgumentNullException.ThrowIfNull(lan);
-            {
-                throw new ArgumentNullException(nameof(lan));
-            }
 
-            if (bindAddresses == null)
+            ArgumentNullException.ThrowIfNull(bindAddresses);
-            {
-                throw new ArgumentNullException(nameof(bindAddresses));
-            }
 
             var conf = new NetworkConfiguration()
             {