Made some code non-static and moved into Serializer

katerd · Jan 12, 2018 · 84fb596 · 84fb596
1 parent 311f90a
commit 84fb596
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/src/Hatchet/HatchetConvert.Rules.cs b/src/Hatchet/HatchetConvert.Rules.cs
@@ -7,8 +7,8 @@ namespace Hatchet
     public static partial class HatchetConvert
     {
         private static List<Tuple<Func<DeserializationContext, bool>, Func<DeserializationContext, object>>> DeserializationRules { get; }
-        
-        private static List<Tuple<Func<object, bool>, Action<SerializationContext>>> SerializationRules { get; }
+
+        internal static List<Tuple<Func<object, bool>, Action<SerializationContext>>> SerializationRules { get; }
 
         static HatchetConvert()
         {

diff --git a/src/Hatchet/HatchetConvert.Serialize.cs b/src/Hatchet/HatchetConvert.Serialize.cs
@@ -24,31 +24,10 @@ public static string Serialize(object input, SerializeOptions serializeOptions)
             var prettyPrinter = new PrettyPrinter(stringBuilder);
             var serializer = new Serializer(prettyPrinter, stringBuilder, serializeOptions);
 
-            Serialize(input, serializer);
+            serializer.Serialize(input, serializer);
             return stringBuilder.ToString();
         }
 
-        private static void Serialize(
-            object input, 
-            Serializer serializer,
-            bool forceClassName = false)
-        {
-            serializer.PushObjectRef(input);
-
-            var context = new SerializationContext(input, serializer, forceClassName);
-
-            foreach (var conversionFunction in SerializationRules)
-            {
-                if (conversionFunction.Item1(input))
-                {
-                    conversionFunction.Item2(context);
-                    serializer.PopObjectRef(input);
-                    return;
-                }
-            }
-            throw new HatchetException($"Could not serialize {input} of type {input.GetType()}");
-        }
-
         private static bool IsSimpleValue(Type inputType)
         {
             return inputType.IsPrimitive 
@@ -226,7 +205,7 @@ private static void SerializeKeyValue(Serializer serializer, string key, object
         private static void IndentAndSerialize(Serializer serializer, object value, bool forceClassName)
         {
             serializer.Indent();
-            Serialize(value, serializer, forceClassName);
+            serializer.Serialize(value, serializer, forceClassName);
             serializer.Deindent();
         }
 

diff --git a/src/Hatchet/Serializer.cs b/src/Hatchet/Serializer.cs
@@ -25,6 +25,27 @@ public Serializer(
             _metObjects = new List<object>();
         }
 
+        internal void Serialize(
+            object input, 
+            Serializer serializer,
+            bool forceClassName = false)
+        {
+            serializer.PushObjectRef(input);
+
+            var context = new SerializationContext(input, serializer, forceClassName);
+
+            foreach (var conversionFunction in HatchetConvert.SerializationRules)
+            {
+                if (conversionFunction.Item1(input))
+                {
+                    conversionFunction.Item2(context);
+                    serializer.PopObjectRef(input);
+                    return;
+                }
+            }
+            throw new HatchetException($"Could not serialize {input} of type {input.GetType()}");
+        }
+
         public void PushObjectRef(object obj)
         {
             var type = obj.GetType();