Renormalize

2018-06-29 19:52:40 +02:00
parent c1f3de7e5c
commit 7a615133ff
1616 changed files with 273322 additions and 273322 deletions
--- a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
+++ b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
@@ -1,72 +1,72 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace Umbraco.Core.Serialization
-{
-    internal class JsonNetSerializer : ISerializer
-    {
-        private readonly JsonSerializerSettings _settings;
-
-        public JsonNetSerializer()
-        {
-            _settings = new JsonSerializerSettings();
-
-            //var customResolver = new CustomIgnoreResolver
-            //    {
-            //        DefaultMembersSearchFlags = BindingFlags.Instance | BindingFlags.Public
-            //    };
-            //_settings.ContractResolver = customResolver;
-
-            var javaScriptDateTimeConverter = new JavaScriptDateTimeConverter();
-
-            _settings.Converters.Add(javaScriptDateTimeConverter);
-            _settings.Converters.Add(new EntityKeyMemberConverter());
-            _settings.Converters.Add(new KeyValuePairConverter());
-            _settings.Converters.Add(new ExpandoObjectConverter());
-            _settings.Converters.Add(new XmlNodeConverter());
-
-            _settings.NullValueHandling = NullValueHandling.Include;
-            _settings.ReferenceLoopHandling = ReferenceLoopHandling.Serialize;
-            _settings.TypeNameHandling = TypeNameHandling.Objects;
-            _settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
-        }
-
-        #region Implementation of ISerializer
-
-        /// <summary>
-        /// Deserialize input stream to object
-        /// </summary>
-        /// <param name="input"></param>
-        /// <param name="outputType"></param>
-        /// <returns></returns>
-        public object FromStream(Stream input, Type outputType)
-        {
-            byte[] bytes = new byte[input.Length];
-            input.Position = 0;
-            input.Read(bytes, 0, (int)input.Length);
-            string s = Encoding.UTF8.GetString(bytes);
-
-            return JsonConvert.DeserializeObject(s, outputType, _settings);
-        }
-
-        /// <summary>
-        /// Serialize object to streamed result
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public IStreamedResult ToStream(object input)
-        {
-            string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
-            byte[] bytes = Encoding.UTF8.GetBytes(s);
-            MemoryStream ms = new MemoryStream(bytes);
-
-            return new StreamedResult(ms, true);
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Umbraco.Core.Serialization
+{
+    internal class JsonNetSerializer : ISerializer
+    {
+        private readonly JsonSerializerSettings _settings;
+
+        public JsonNetSerializer()
+        {
+            _settings = new JsonSerializerSettings();
+
+            //var customResolver = new CustomIgnoreResolver
+            //    {
+            //        DefaultMembersSearchFlags = BindingFlags.Instance | BindingFlags.Public
+            //    };
+            //_settings.ContractResolver = customResolver;
+
+            var javaScriptDateTimeConverter = new JavaScriptDateTimeConverter();
+
+            _settings.Converters.Add(javaScriptDateTimeConverter);
+            _settings.Converters.Add(new EntityKeyMemberConverter());
+            _settings.Converters.Add(new KeyValuePairConverter());
+            _settings.Converters.Add(new ExpandoObjectConverter());
+            _settings.Converters.Add(new XmlNodeConverter());
+
+            _settings.NullValueHandling = NullValueHandling.Include;
+            _settings.ReferenceLoopHandling = ReferenceLoopHandling.Serialize;
+            _settings.TypeNameHandling = TypeNameHandling.Objects;
+            _settings.ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor;
+        }
+
+        #region Implementation of ISerializer
+
+        /// <summary>
+        /// Deserialize input stream to object
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="outputType"></param>
+        /// <returns></returns>
+        public object FromStream(Stream input, Type outputType)
+        {
+            byte[] bytes = new byte[input.Length];
+            input.Position = 0;
+            input.Read(bytes, 0, (int)input.Length);
+            string s = Encoding.UTF8.GetString(bytes);
+
+            return JsonConvert.DeserializeObject(s, outputType, _settings);
+        }
+
+        /// <summary>
+        /// Serialize object to streamed result
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public IStreamedResult ToStream(object input)
+        {
+            string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
+            byte[] bytes = Encoding.UTF8.GetBytes(s);
+            MemoryStream ms = new MemoryStream(bytes);
+
+            return new StreamedResult(ms, true);
+        }
+
+        #endregion
+    }
+}