1 files changed, 51 insertions, 34 deletions
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index b76edd2bc..405d6125f 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -20,54 +20,71 @@ namespace MediaBrowser.Common.Json
         public const string CamelCaseMediaType = "application/json; profile=\"CamelCase\"";
 
         /// <summary>
-        /// Gets the default <see cref="JsonSerializerOptions" /> options.
-        /// </summary>
-        /// <remarks>
         /// When changing these options, update
-        ///     Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
-        ///         -> AddJellyfinApi
-        ///             -> AddJsonOptions.
-        /// </remarks>
-        /// <returns>The default <see cref="JsonSerializerOptions" /> options.</returns>
-        public static JsonSerializerOptions GetOptions()
+        ///  Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+        ///   -> AddJellyfinApi
+        ///    -> AddJsonOptions.
+        /// </summary>
+        private static readonly JsonSerializerOptions _jsonSerializerOptions = new ()
         {
-            var options = new JsonSerializerOptions
+            ReadCommentHandling = JsonCommentHandling.Disallow,
+            WriteIndented = false,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            NumberHandling = JsonNumberHandling.AllowReadingFromString,
+            Converters =
             {
-                ReadCommentHandling = JsonCommentHandling.Disallow,
-                WriteIndented = false,
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                NumberHandling = JsonNumberHandling.AllowReadingFromString
-            };
+                new JsonGuidConverter(),
+                new JsonNullableGuidConverter(),
+                new JsonVersionConverter(),
+                new JsonStringEnumConverter(),
+                new JsonNullableStructConverterFactory(),
+                new JsonBoolNumberConverter(),
+                new JsonDateTimeConverter(),
+                new JsonStringConverter()
+            }
+        };
 
-            options.Converters.Add(new JsonGuidConverter());
-            options.Converters.Add(new JsonVersionConverter());
-            options.Converters.Add(new JsonStringEnumConverter());
-            options.Converters.Add(new JsonNullableStructConverterFactory());
-            options.Converters.Add(new JsonBoolNumberConverter());
+        private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new (_jsonSerializerOptions)
+        {
+            PropertyNamingPolicy = null
+        };
 
-            return options;
-        }
+        private static readonly JsonSerializerOptions _camelCaseJsonSerializerOptions = new (_jsonSerializerOptions)
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+        };
+
+        /// <summary>
+        /// Gets the default <see cref="JsonSerializerOptions" /> options.
+        /// </summary>
+        /// <remarks>
+        /// The return value must not be modified.
+        /// If the defaults must be modified the author must use the copy constructor.
+        /// </remarks>
+        /// <returns>The default <see cref="JsonSerializerOptions" /> options.</returns>
+        public static JsonSerializerOptions Options
+            => _jsonSerializerOptions;
 
         /// <summary>
         /// Gets camelCase json options.
         /// </summary>
+        /// <remarks>
+        /// The return value must not be modified.
+        /// If the defaults must be modified the author must use the copy constructor.
+        /// </remarks>
         /// <returns>The camelCase <see cref="JsonSerializerOptions" /> options.</returns>
-        public static JsonSerializerOptions GetCamelCaseOptions()
-        {
-            var options = GetOptions();
-            options.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-            return options;
-        }
+        public static JsonSerializerOptions CamelCaseOptions
+            => _camelCaseJsonSerializerOptions;
 
         /// <summary>
         /// Gets PascalCase json options.
         /// </summary>
+        /// <remarks>
+        /// The return value must not be modified.
+        /// If the defaults must be modified the author must use the copy constructor.
+        /// </remarks>
         /// <returns>The PascalCase <see cref="JsonSerializerOptions" /> options.</returns>
-        public static JsonSerializerOptions GetPascalCaseOptions()
-        {
-            var options = GetOptions();
-            options.PropertyNamingPolicy = null;
-            return options;
-        }
+        public static JsonSerializerOptions PascalCaseOptions
+            => _pascalCaseJsonSerializerOptions;
     }
 }