Core - DevToolsClient reuse json serializer options / settings (#4851)

Author: campersau

CefSharp.Core/DevTools/DevToolsClient.cs

@@ -97,7 +97,7 @@ public bool RemoveEventHandler<T>(string eventName, EventHandler<T> eventHandler
             {
                 var p = ((EventProxy<T>)eventProxy);
 
-                if(p.RemoveHandler(eventHandler))
+                if (p.RemoveHandler(eventHandler))
                 {
                     return !eventHandlers.TryRemove(eventName, out _);
                 }
@@ -218,7 +218,7 @@ public void Dispose()
                 var events = eventHandlers.Values;
                 eventHandlers.Clear();
 
-                foreach(var evt in events)
+                foreach (var evt in events)
                 {
                     evt.Dispose();
                 }
@@ -257,21 +257,21 @@ void IDevToolsMessageObserver.OnDevToolsEvent(IBrowser browser, string method, S
                     eventProxy.Raise(this, method, parameters, SyncContext);
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 var errorEvent = DevToolsEventError;
 
                 var json = "";
 
-                if(parameters.Length > 0)
+                if (parameters.Length > 0)
                 {
                     parameters.Position = 0;
 
                     try
                     {
                         json = StreamToString(parameters, leaveOpen: false);
                     }
-                    catch(Exception)
+                    catch (Exception)
                     {
                         //TODO: do we somehow pass this exception to the user?
                     }
@@ -338,7 +338,7 @@ void IDevToolsMessageObserver.OnDevToolsMethodResult(IBrowser browser, int messa
         /// <param name="eventName">event Name</param>
         /// <param name="stream">JSON stream</param>
         /// <returns>object of type <typeparamref name="T"/></returns>
-        private static T DeserializeJsonEvent<T>(string eventName, Stream stream)  where T : EventArgs
+        private static T DeserializeJsonEvent<T>(string eventName, Stream stream) where T : EventArgs
         {
             if (typeof(T) == typeof(EventArgs))
             {
@@ -369,6 +369,20 @@ private static T DeserializeJson<T>(Stream stream)
             return (T)DeserializeJson(typeof(T), stream);
         }
 
+#if NETCOREAPP
+        private static readonly System.Text.Json.JsonSerializerOptions DefaultJsonSerializerOptions = new System.Text.Json.JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true,
+            IgnoreNullValues = true,
+            Converters = { new CefSharp.Internals.Json.JsonEnumConverterFactory() },
+        };
+#else
+        private static readonly System.Runtime.Serialization.Json.DataContractJsonSerializerSettings DefaultJsonSerializerSettings = new System.Runtime.Serialization.Json.DataContractJsonSerializerSettings
+        {
+            UseSimpleDictionaryFormat = true,
+        };
+#endif
+
         /// <summary>
         /// Deserialize the JSON stream into a .Net object.
         /// For .Net Core/.Net 5.0 uses System.Text.Json
@@ -380,24 +394,13 @@ private static T DeserializeJson<T>(Stream stream)
         private static object DeserializeJson(Type type, Stream stream)
         {
 #if NETCOREAPP
-            var options = new System.Text.Json.JsonSerializerOptions
-            {
-                PropertyNameCaseInsensitive = true,
-                IgnoreNullValues = true,
-            };
-
-            options.Converters.Add(new CefSharp.Internals.Json.JsonEnumConverterFactory());
-
             // TODO: use synchronus Deserialize<T>(Stream) when System.Text.Json gets updated
             var memoryStream = new MemoryStream((int)stream.Length);
             stream.CopyTo(memoryStream);
 
-            return System.Text.Json.JsonSerializer.Deserialize(memoryStream.ToArray(), type, options);
+            return System.Text.Json.JsonSerializer.Deserialize(memoryStream.ToArray(), type, DefaultJsonSerializerOptions);
 #else
-            var settings = new System.Runtime.Serialization.Json.DataContractJsonSerializerSettings();
-            settings.UseSimpleDictionaryFormat = true;
-
-            var dcs = new System.Runtime.Serialization.Json.DataContractJsonSerializer(type, settings);
+            var dcs = new System.Runtime.Serialization.Json.DataContractJsonSerializer(type, DefaultJsonSerializerSettings);
             return dcs.ReadObject(stream);
 #endif
         }