Changeset 15986 for branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/Transformers.cs

Timestamp:

07/05/18 17:22:34 (6 years ago)

Author:

jkarder

Message:

#2520: worked on new persistence

• removed type version
• removed conversions
• execute AfterDeserialization hooks after all objects have been populated
• worked on transformers

File:

• branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/Transformers.cs (modified) (10 diffs)

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/Transformers.cs

@@ -48 +48 @@
 
     public override object ToObject(Box box, Mapper mapper) {
-      return Extract(box, (Type)mapper.GetObject(box.TypeBoxId), mapper);
+      var type = (Type)mapper.GetObject(box.TypeBoxId);
+      return type == null ? default(T) : Extract(box, type, mapper);
     }
 
@@ -80 +81 @@
         box.TypeId = mapper.GetTypeId(type);
       }
-
-      if (StorableTypeAttribute.IsStorableType(type))
-        box.TypeVersion = StorableTypeAttribute.GetStorableTypeAttribute(type).Version;
     }
 
     public override object ToObject(Box box, Mapper mapper) {
-      return Extract(box, mapper.GetType(box.TypeId), mapper);
+      Type type;
+      return mapper.TryGetType(box.TypeId, out type) ? Extract(box, type, mapper) : null;
     }
 
     private object Extract(Box box, Type type, Mapper mapper) {
       if (type.IsGenericType) {
-        return type.MakeGenericType(box.GenericTypeBoxIds.Select(x => (Type)mapper.GetObject(x)).ToArray());
+        var genericArgumentTypes = box.GenericTypeBoxIds.Select(x => (Type)mapper.GetObject(x)).ToArray();
+        return genericArgumentTypes.Any(x => x == null) ? null : type.MakeGenericType(genericArgumentTypes);
       } else if (type == typeof(Array)) {
-        return ((Type)mapper.GetObject(box.GenericTypeBoxIds[0])).MakeArrayType();
+        var arrayType = (Type)mapper.GetObject(box.GenericTypeBoxIds[0]);
+        return arrayType?.MakeArrayType();
       } else {
         return type;
@@ -526 +527 @@
         var box = new Box {
           TransformerId = mapper.GetTransformerId(this),
-          TypeId = mapper.GetStringId(o.GetType().AssemblyQualifiedName),
-          UInt = mapper.GetStringId(Enum.Format(o.GetType(), o, "G")),
+          TypeBoxId = mapper.GetBoxId(o.GetType()),
+          UInt = mapper.GetStringId(Enum.Format(o.GetType(), o, "G")) // TODO: introduce old names for enum values to enable refactoring
         };
         return box;
@@ -533 +534 @@
 
       public override object ToObject(Box box, Mapper mapper) {
-        return Enum.Parse(Type.GetType(mapper.GetString(box.TypeId)), mapper.GetString(box.UInt));
+        var type = (Type)mapper.GetObject(box.TypeBoxId);
+        return type == null ? null : Enum.Parse(type, mapper.GetString(box.UInt));
       }
     }
@@ -784 +786 @@
     protected override void Populate(Box box, object value, Mapper mapper) {
       var kvps = box.KeyValuePairs;
-      var parentTypeVersions = box.UInts;
       var emptyArgs = new object[0];
 
@@ -815 +816 @@
         }
 
-        if (type != originalType) {
-          parentTypeVersions.AddRange(new[] { mapper.GetStringId(guid.ToString()), attribute.Version });
-        }
-
         type = type.BaseType;
       }
@@ -829 +826 @@
     public override void FillFromBox(object obj, Box box, Mapper mapper) {
       var kvps = box.KeyValuePairs;
-      var parentTypeVersions = box.UInts;
       var emptyArgs = new object[0];
 
@@ -840 +836 @@
 
       var type = (Type)mapper.GetObject(box.TypeBoxId);
-      var typeBox = mapper.GetBox(box.TypeBoxId);
       var typeInfo = Mapper.StaticCache.GetTypeInfo(type);
-
-      var typeVersions = new List<Tuple<Guid, uint>>();
-      typeVersions.Add(Tuple.Create(typeInfo.StorableTypeAttribute.Guid, typeBox.TypeVersion));
-      for (int i = 0; i < parentTypeVersions.Count; i += 2)
-        typeVersions.Add(Tuple.Create(Guid.Parse(mapper.GetString(parentTypeVersions[i])), parentTypeVersions[i + 1]));
-
-      while (true) {
-        var applicableConversion = Mapper.StaticCache.GetStorableConversions(typeVersions).FirstOrDefault();
-        if (applicableConversion == null) break;
-
-        Dictionary<string, object> newDict;
-        List<Tuple<string, uint>> typeChain = null;
-
-        var conversionParameters = applicableConversion.GetParameters();
-        if (conversionParameters.Length == 1) {
-          newDict = (Dictionary<string, object>)applicableConversion.Invoke(null, new object[] { dict });
-        } else if (conversionParameters.Length == 2) {
-          var parameters = new object[] { dict, typeChain };
-          newDict = (Dictionary<string, object>)applicableConversion.Invoke(null, parameters);
-          typeChain = (List<Tuple<string, uint>>)parameters[1];
-        } else throw new PersistenceException("Conversion method has an invalid signature.");
-
-        foreach (var kvp in newDict) dict[kvp.Key] = kvp.Value;
-
-        var convertedType = StorableConversionAttribute.GetGuid(applicableConversion);
-        var convertedVersion = StorableConversionAttribute.GetVersion(applicableConversion);
-
-        var index = typeVersions.FindIndex(x => x.Item1 == convertedType);
-        typeVersions.RemoveAt(index);
-        typeVersions.Insert(index, Tuple.Create(convertedType, convertedVersion + 1));
-
-        if (typeChain != null && typeChain.Any()) {
-          typeVersions.RemoveRange(index + 1, typeVersions.Count - (index + 1));
-          typeVersions.AddRange(typeChain.Select(x => Tuple.Create(Guid.Parse(x.Item1), x.Item2)));
-        }
-      }
-
       var typeStack = new Stack<Tuple<Type, TypeInfo>>();
 
@@ -905 +863 @@
         }
 
-        // set all members as generated by conversion method chain
+        // set all members
         foreach (var kvp in dict) {
           string key = kvp.Key;
@@ -940 +898 @@
         //    typeInfo.StorableTypeAttribute.Version,
         //    string.Join(", ", undefinedMembers.Select(x => x.Key))));
-
-        foreach (var hook in typeInfo.AfterDeserializationHooks) {
-          hook.Invoke(obj, emptyArgs);
-        }
       }
     }