Changeset 1349 for branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs

Timestamp:

03/16/09 17:46:28 (15 years ago)

Author:

epitzer

Message:

Central persistence configuration class. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs (modified) (6 diffs)

branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System;
-using System.Reflection;
-using System.Text;
 
 namespace Persistence {
@@ -64 +62 @@
     private readonly Dictionary<Type, Handler> handlers;
     private readonly Stack<IAccessibleObject> compositeStack;
-
-    private readonly Dictionary<Type, IFormatter> primitiveSerializers;
-    private readonly List<IDecomposer> customSerializers;
+    private readonly PersistenceConfiguration persistenceConfiguration;
 
     delegate void Thunk();
     private List<Thunk> finalFixes;
 
-    public DeSerializer() : this(
-      InterfaceInstantiatior.InstantiateAll<IFormatter>(),
-      InterfaceInstantiatior.InstantiateAll<IDecomposer>()) {}    
-
-    public DeSerializer(
-        IEnumerable<IFormatter> primitiveSerializers,
-        IEnumerable<IDecomposer> customSerializers) {
+    public DeSerializer() : this(PersistenceConfiguration.Instance) {}
+  
+    public DeSerializer(PersistenceConfiguration persistenceConfiguration) {
+      this.persistenceConfiguration = persistenceConfiguration;
       id2obj = new Dictionary<int, object>();
       compositeStack = new Stack<IAccessibleObject>();
@@ -86 +79 @@
                      {typeof (Reference), ReferenceHandler},
                      {typeof (Null), NullHandler}
-                   };
-      this.primitiveSerializers = new Dictionary<Type, IFormatter>();
-      foreach (IFormatter ps in primitiveSerializers) {
-        this.primitiveSerializers.Add(ps.Type, ps);
-      }
-      this.customSerializers = new List<IDecomposer>(customSerializers);
+                   };      
     }
 
@@ -108 +96 @@
       CompositeStart start = (CompositeStart)token;
       object instance;
-      if (FindCompoundSerializer(start.Type) != null) {
+      if (persistenceConfiguration.GetDecomposer(start.Type) != null) {
         instance = new ParentReference();
         compositeStack.Push(new CustomObject(instance));        
@@ -121 +109 @@
     }
     private void CompositeEndHandler(IParseToken token) {
-      CompositeEnd end = (CompositeEnd)token;
-      IDecomposer decomposer = FindCompoundSerializer(end.Type);
+      CompositeEnd end = (CompositeEnd)token;      
+      IDecomposer decomposer = persistenceConfiguration.GetDecomposer(end.Type);
       if (decomposer != null) {
         CustomObject customObject = (CustomObject)compositeStack.Pop();
@@ -135 +123 @@
         SetValue(end.Name, compositeObject.Obj);
       }
-    }
-    private IDecomposer FindCompoundSerializer(Type type) {
-      foreach (IDecomposer serializer in customSerializers) {
-        if (serializer.CanSerialize(type))
-          return serializer;
-      }
-      return null;
-    }
+    }    
     private void PrimitiveHandler(IParseToken token) {
       Primitive primitive = (Primitive)token;
-      object value = primitiveSerializers[primitive.Type].DeSerialize(primitive.SerializedValue);
+      object value = persistenceConfiguration
+        .GetFormatter(XmlFormat.Instance, primitive.Type)
+        .DeSerialize(primitive.SerializedValue);
       if ( ! value.GetType().IsValueType )
         id2obj[(int)primitive.Id] = value;