Add singleton pattern calls

Author: vla

src/Es.Serializer.Jil/JilSerializer.cs

@@ -7,6 +7,11 @@ public class JilSerializer : ObjectSerializerBase
     {
         private Jil.Options _options;
 
+        /// <summary>
+        /// JilSerializer Instance
+        /// </summary>
+        public static JilSerializer Instance = new JilSerializer();
+
         public JilSerializer(Jil.Options options) {
             _options = options;
         }

src/Es.Serializer.JsonNet/JsonNetSerializer.cs

@@ -12,6 +12,13 @@ public class JsonNetSerializer : ObjectSerializerBase
 #else
         private static readonly Formatting _format = Formatting.None;
 #endif
+
+        /// <summary>
+        /// JsonNetSerializer Instance
+        /// </summary>
+        public static JsonNetSerializer Instance = new JsonNetSerializer();
+
+
         private readonly JsonSerializerSettings _setting;
 
         public JsonNetSerializer(JsonSerializerSettings setting) {

src/Es.Serializer.NetSerializer/NetSerializer.cs

@@ -24,6 +24,7 @@ namespace Es.Serializer
     /// </summary>
     public class NETSerializer : ObjectSerializerBase
     {
+
         /// <summary>
         /// The _serializer
         /// </summary>

src/Es.Serializer.ProtoBuf/ProtoBufSerializer.cs

@@ -6,6 +6,11 @@ namespace Es.Serializer
 {
     public class ProtoBufSerializer : ObjectSerializerBase
     {
+        /// <summary>
+        /// ProtoBufSerializer Instance
+        /// </summary>
+        public static ProtoBufSerializer Instance = new ProtoBufSerializer();
+
         public override void Serialize(object value, Stream output) {
             RuntimeTypeModel.Default.Serialize(output, value);
         }

src/Es.Serializer/BinarySerializer.cs

@@ -79,7 +79,7 @@ public override string SerializeToString(object value)
         public override object DeserializeFromString(string serializedText, Type type)
         {
             var data = FromHex(serializedText);
-            using (MemoryStream mem = new MemoryStream(data))
+            using (MemoryStream mem = MemoryStreamFactory.GetStream(data))
             {
                 return Deserialize(mem, type);
             }

src/Es.Serializer/ObjectSerializerBase.cs

@@ -55,7 +55,8 @@ public abstract class ObjectSerializerBase : IObjectSerializer, IStringSerialize
         /// <param name="reader">The reader.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        public object Deserialize(TextReader reader, Type type) {
+        public object Deserialize(TextReader reader, Type type)
+        {
             return DeserializeCore(reader, type);
         }
 
@@ -65,7 +66,8 @@ public object Deserialize(TextReader reader, Type type) {
         /// <param name="stream">The stream.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        public virtual object Deserialize(Stream stream, Type type) {
+        public virtual object Deserialize(Stream stream, Type type)
+        {
 #if NET40
             using (StreamReader reader = new StreamReader(stream, Encoding, true, bufferSize))
 #else
@@ -80,8 +82,10 @@ public virtual object Deserialize(Stream stream, Type type) {
         /// <param name="data">The data.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        public virtual object Deserialize(byte[] data, Type type) {
-            using (var mem = MemoryStreamFactory.GetStream(data)) {
+        public virtual object Deserialize(byte[] data, Type type)
+        {
+            using (var mem = MemoryStreamFactory.GetStream(data))
+            {
                 return Deserialize(mem, type);
             }
         }
@@ -91,7 +95,8 @@ public virtual object Deserialize(byte[] data, Type type) {
         /// </summary>
         /// <param name="value">The value.</param>
         /// <param name="writer">The writer.</param>
-        public void Serialize(object value, TextWriter writer) {
+        public void Serialize(object value, TextWriter writer)
+        {
             SerializeCore(value, writer);
         }
 
@@ -100,7 +105,8 @@ public void Serialize(object value, TextWriter writer) {
         /// </summary>
         /// <param name="value">The value.</param>
         /// <param name="output">The output.</param>
-        public virtual void Serialize(object value, Stream output) {
+        public virtual void Serialize(object value, Stream output)
+        {
 #if NET40
             using (StreamWriter sw = new StreamWriter(output, Encoding, bufferSize))
 #else
@@ -114,8 +120,10 @@ public virtual void Serialize(object value, Stream output) {
         /// </summary>
         /// <param name="value">The value.</param>
         /// <param name="output">The output.</param>
-        public virtual void Serialize(object value, out byte[] output) {
-            using (var mem = MemoryStreamFactory.GetStream()) {
+        public virtual void Serialize(object value, out byte[] output)
+        {
+            using (var mem = MemoryStreamFactory.GetStream())
+            {
                 Serialize(value, mem);
                 output = mem.ToArray();
             }
@@ -126,10 +134,20 @@ public virtual void Serialize(object value, out byte[] output) {
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>System.String.</returns>
-        public virtual string SerializeToString(object value) {
-            using (StringWriter writer = new StringWriter()) {
-                SerializeCore(value, writer);
-                return writer.ToString();
+        public virtual string SerializeToString(object value)
+        {
+            using (var ms = MemoryStreamFactory.GetStream())
+            {
+                using (StreamWriter writer = new StreamWriter(ms))
+                {
+                    SerializeCore(value, writer);
+
+                    writer.Flush();
+
+                    ms.Seek(0, SeekOrigin.Begin);
+                    var reader = new StreamReader(ms);
+                    return reader.ReadToEnd();
+                }
             }
         }
 
@@ -139,8 +157,10 @@ public virtual string SerializeToString(object value) {
         /// <param name="serializedText">The serialized text.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        public virtual object DeserializeFromString(string serializedText, Type type) {
-            using (StringReader reader = new StringReader(serializedText)) {
+        public virtual object DeserializeFromString(string serializedText, Type type)
+        {
+            using (StringReader reader = new StringReader(serializedText))
+            {
                 return DeserializeCore(reader, type);
             }
         }
@@ -151,7 +171,8 @@ public virtual object DeserializeFromString(string serializedText, Type type) {
         /// </summary>
         /// <param name="data">The data.</param>
         /// <returns>System.String.</returns>
-        protected static string ToHex(byte[] data) {
+        protected static string ToHex(byte[] data)
+        {
             return BitConverter.ToString(data).Replace("-", string.Empty);
         }
 
@@ -161,7 +182,8 @@ protected static string ToHex(byte[] data) {
         /// </summary>
         /// <param name="hex">The hexadecimal.</param>
         /// <returns>System.Byte[].</returns>
-        protected static byte[] FromHex(string hex) {
+        protected static byte[] FromHex(string hex)
+        {
             if (string.IsNullOrEmpty(hex)) return new byte[0];
             if ((hex.Length % 2) != 0)
                 hex += " ";

src/Es.Serializer/SerializerExtensions.cs

@@ -88,8 +88,7 @@ public static T DeepClone<T>(this ObjectSerializerBase self, T obj) {
         /// <param name="obj">The object.</param>
         /// <returns>T.</returns>
         public static T DeepClone<T>(this T obj) {
-            var serializer = SerializerFactory.Get("xml");
-            return (T)serializer.DeepClone(obj);
+            return (T)XmlSerializer.Instance.DeepClone(obj);
         }
     }
 }