11 files changed, 19 insertions, 68 deletions
diff --git a/Jellyfin.Data/Entities/ActivityLog.cs b/Jellyfin.Data/Entities/ActivityLog.cs
index 1d1b86552..51dd0ffb8 100644
--- a/Jellyfin.Data/Entities/ActivityLog.cs
+++ b/Jellyfin.Data/Entities/ActivityLog.cs
@@ -20,15 +20,8 @@ namespace Jellyfin.Data.Entities
         /// <param name="userId">The user id.</param>
         public ActivityLog(string name, string type, Guid userId)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
-
-            if (string.IsNullOrEmpty(type))
-            {
-                throw new ArgumentNullException(nameof(type));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
+            ArgumentException.ThrowIfNullOrEmpty(type);
 
             Name = name;
             Type = type;
diff --git a/Jellyfin.Data/Entities/Group.cs b/Jellyfin.Data/Entities/Group.cs
index 14da0bb15..1be6f986a 100644
--- a/Jellyfin.Data/Entities/Group.cs
+++ b/Jellyfin.Data/Entities/Group.cs
@@ -18,10 +18,7 @@ namespace Jellyfin.Data.Entities
         /// <param name="name">The name of the group.</param>
         public Group(string name)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             Name = name;
             Id = Guid.NewGuid();
diff --git a/Jellyfin.Data/Entities/Libraries/Artwork.cs b/Jellyfin.Data/Entities/Libraries/Artwork.cs
index 923525fc5..fc3c1036f 100644
--- a/Jellyfin.Data/Entities/Libraries/Artwork.cs
+++ b/Jellyfin.Data/Entities/Libraries/Artwork.cs
@@ -18,10 +18,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="kind">The kind of art.</param>
         public Artwork(string path, ArtKind kind)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(path);
 
             Path = path;
             Kind = kind;
diff --git a/Jellyfin.Data/Entities/Libraries/Chapter.cs b/Jellyfin.Data/Entities/Libraries/Chapter.cs
index 3d81f713d..f068338f9 100644
--- a/Jellyfin.Data/Entities/Libraries/Chapter.cs
+++ b/Jellyfin.Data/Entities/Libraries/Chapter.cs
@@ -17,10 +17,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="startTime">The start time for this chapter.</param>
         public Chapter(string language, long startTime)
         {
-            if (string.IsNullOrEmpty(language))
-            {
-                throw new ArgumentNullException(nameof(language));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(language);
 
             Language = language;
             StartTime = startTime;
diff --git a/Jellyfin.Data/Entities/Libraries/ItemMetadata.cs b/Jellyfin.Data/Entities/Libraries/ItemMetadata.cs
index d429a90c6..fa9276c66 100644
--- a/Jellyfin.Data/Entities/Libraries/ItemMetadata.cs
+++ b/Jellyfin.Data/Entities/Libraries/ItemMetadata.cs
@@ -18,15 +18,8 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="language">ISO-639-3 3-character language codes.</param>
         protected ItemMetadata(string title, string language)
         {
-            if (string.IsNullOrEmpty(title))
-            {
-                throw new ArgumentNullException(nameof(title));
-            }
-
-            if (string.IsNullOrEmpty(language))
-            {
-                throw new ArgumentNullException(nameof(language));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(title);
+            ArgumentException.ThrowIfNullOrEmpty(language);
 
             Title = title;
             Language = language;
diff --git a/Jellyfin.Data/Entities/Libraries/MediaFile.cs b/Jellyfin.Data/Entities/Libraries/MediaFile.cs
index 36e1e4777..7b5a3af64 100644
--- a/Jellyfin.Data/Entities/Libraries/MediaFile.cs
+++ b/Jellyfin.Data/Entities/Libraries/MediaFile.cs
@@ -19,10 +19,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="kind">The file kind.</param>
         public MediaFile(string path, MediaFileKind kind)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(path);
 
             Path = path;
             Kind = kind;
diff --git a/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs b/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
index b27196078..b38d6a4f1 100644
--- a/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
+++ b/Jellyfin.Data/Entities/Libraries/MetadataProvider.cs
@@ -16,10 +16,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="name">The name of the metadata provider.</param>
         public MetadataProvider(string name)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             Name = name;
         }
diff --git a/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs b/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
index 44c198518..a198f53ba 100644
--- a/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
+++ b/Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs
@@ -17,10 +17,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="metadataProvider">The metadata provider.</param>
         public MetadataProviderId(string providerId, MetadataProvider metadataProvider)
         {
-            if (string.IsNullOrEmpty(providerId))
-            {
-                throw new ArgumentNullException(nameof(providerId));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(providerId);
 
             ProviderId = providerId;
             MetadataProvider = metadataProvider;
diff --git a/Jellyfin.Data/Entities/Libraries/Person.cs b/Jellyfin.Data/Entities/Libraries/Person.cs
index 8b67d920d..90dc55b70 100644
--- a/Jellyfin.Data/Entities/Libraries/Person.cs
+++ b/Jellyfin.Data/Entities/Libraries/Person.cs
@@ -17,10 +17,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="name">The name of the person.</param>
         public Person(string name)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             Name = name;
             DateAdded = DateTime.UtcNow;
diff --git a/Jellyfin.Data/Entities/Libraries/Release.cs b/Jellyfin.Data/Entities/Libraries/Release.cs
index d3d52bf5c..e68ab9105 100644
--- a/Jellyfin.Data/Entities/Libraries/Release.cs
+++ b/Jellyfin.Data/Entities/Libraries/Release.cs
@@ -17,10 +17,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// <param name="name">The name of this release.</param>
         public Release(string name)
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException(nameof(name));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(name);
 
             Name = name;
 
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 26c46a704..eb59e70f3 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -29,20 +29,9 @@ namespace Jellyfin.Data.Entities
         /// <param name="passwordResetProviderId">The Id of the user's password reset provider.</param>
         public User(string username, string authenticationProviderId, string passwordResetProviderId)
         {
-            if (string.IsNullOrEmpty(username))
-            {
-                throw new ArgumentNullException(nameof(username));
-            }
-
-            if (string.IsNullOrEmpty(authenticationProviderId))
-            {
-                throw new ArgumentNullException(nameof(authenticationProviderId));
-            }
-
-            if (string.IsNullOrEmpty(passwordResetProviderId))
-            {
-                throw new ArgumentNullException(nameof(passwordResetProviderId));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(username);
+            ArgumentException.ThrowIfNullOrEmpty(authenticationProviderId);
+            ArgumentException.ThrowIfNullOrEmpty(passwordResetProviderId);
 
             Username = username;
             AuthenticationProviderId = authenticationProviderId;
@@ -373,7 +362,7 @@ namespace Jellyfin.Data.Entities
         public void SetPermission(PermissionKind kind, bool value)
         {
             var currentPermission = Permissions.FirstOrDefault(p => p.Kind == kind);
-            if (currentPermission == null)
+            if (currentPermission is null)
             {
                 Permissions.Add(new Permission(kind, value));
             }
@@ -419,7 +408,7 @@ namespace Jellyfin.Data.Entities
                 try
                 {
                     var parsedValue = converter.ConvertFromString(stringValues[i].Trim());
-                    if (parsedValue != null)
+                    if (parsedValue is not null)
                     {
                         parsedValues[convertedCount++] = (T)parsedValue;
                     }
@@ -442,7 +431,7 @@ namespace Jellyfin.Data.Entities
         {
             var value = string.Join(Delimiter, values);
             var currentPreference = Preferences.FirstOrDefault(p => p.Kind == preference);
-            if (currentPreference == null)
+            if (currentPreference is null)
             {
                 Preferences.Add(new Preference(preference, value));
             }
@@ -462,7 +451,7 @@ namespace Jellyfin.Data.Entities
         {
             var value = string.Join(Delimiter, values);
             var currentPreference = Preferences.FirstOrDefault(p => p.Kind == preference);
-            if (currentPreference == null)
+            if (currentPreference is null)
             {
                 Preferences.Add(new Preference(preference, value));
             }