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

Timestamp:

10/03/18 17:48:20 (6 years ago)

Author:

jkarder

Message:

#2520: worked on new persistence

• added cache for different attributes
• refactored StorableTypeBoxTransformer
• implemented paths for Storable members
• implemented more unit tests

File:

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

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

@@ -473 +473 @@
   [Transformer("C47A62F5-F113-4A43-A8EE-CF817EC799A2", 303)]
   [StorableType("BA53DF84-DC97-4D8D-A493-868972ED1002")]
-  internal sealed class DictionaryTransformer : BoxTransformer<object> {
+  internal sealed class IDictionary : BoxTransformer<object> {
     public override bool CanTransformType(Type type) {
       return type.IsGenericType && typeof(Dictionary<,>) == type.GetGenericTypeDefinition();
@@ -480 +480 @@
     protected override void Populate(Box box, object value, Mapper mapper) {
       var kvps = box.KeyValuePairs;
-      foreach (DictionaryEntry item in (IDictionary)value)
+      foreach (DictionaryEntry item in (System.Collections.IDictionary)value)
         kvps.Add(mapper.GetBoxId(item.Key), mapper.GetBoxId(item.Value));
 
@@ -855 +855 @@
           if (attrib != null && attrib.DefaultValue != null)
             fieldInfo.SetValue(obj, attrib.DefaultValue);
+
+          object value;
+          if (!dict.TryGetValue(componentInfo.FullName, out value)) continue;
+
+          var field = (FieldInfo)componentInfo.MemberInfo;
+          field.SetValue(obj, value);
         }
+
         foreach (var componentInfo in typeInfo.Properties.Where(x => x.Writeable)) {
           var attrib = componentInfo.StorableAttribute;
@@ -861 +868 @@
           if (attrib != null && attrib.DefaultValue != null)
             property.SetValue(obj, attrib.DefaultValue, null);
+
+          object value;
+          if (!dict.TryGetValue(componentInfo.FullName, out value)) continue;
+
+          var prop = (PropertyInfo)componentInfo.MemberInfo;
+          prop.SetValue(obj, value, null);
         }
 
         // set all members
-        foreach (var kvp in dict) {
-          string key = kvp.Key;
-          object val = kvp.Value;
-
-          string[] keyParts = key.Split('.');
-          var guid = Guid.Parse(keyParts[0]);
-          string ident = keyParts[1];
-
-          if (guid != typeInfo.StorableTypeAttribute.Guid) continue;
-
-          var fieldInfo = typeInfo.Fields.FirstOrDefault(fi => fi.Name == ident);
-          if (fieldInfo != null) {
-            var field = (FieldInfo)fieldInfo.MemberInfo;
-            field.SetValue(obj, val);
-            //dict.Remove(guid.ToString().ToUpperInvariant() + "." + fieldInfo.Name); // only for consistency check
-            continue;
-          }
-
-          var propInfo = typeInfo.Properties.Where(x => x.Writeable).FirstOrDefault(fi => fi.Name == ident);
-          if (propInfo != null) {
-            var prop = (PropertyInfo)propInfo.MemberInfo;
-            prop.SetValue(obj, val, null);
-            //dict.Remove(guid.ToString().ToUpperInvariant() + "." + propInfo.Name); // only for consistency check
-            continue;
-          }
-        }
+        //foreach (var kvp in dict) {
+        //  string key = kvp.Key;
+        //  object val = kvp.Value;
+
+        //  string[] keyParts = key.Split('.');
+        //  var guid = Guid.Parse(keyParts[0]);
+        //  string ident = keyParts[1];
+
+        //  if (guid != typeInfo.StorableTypeAttribute.Guid) continue;
+
+        //  var fieldInfo = typeInfo.Fields.FirstOrDefault(fi => fi.Name == ident);
+        //  if (fieldInfo != null) {
+        //    var field = (FieldInfo)fieldInfo.MemberInfo;
+        //    field.SetValue(obj, val);
+        //    //dict.Remove(guid.ToString().ToUpperInvariant() + "." + fieldInfo.Name); // only for consistency check
+        //    continue;
+        //  }
+
+        //  var propInfo = typeInfo.Properties.Where(x => x.Writeable).FirstOrDefault(fi => fi.Name == ident);
+        //  if (propInfo != null) {
+        //    var prop = (PropertyInfo)propInfo.MemberInfo;
+        //    prop.SetValue(obj, val, null);
+        //    //dict.Remove(guid.ToString().ToUpperInvariant() + "." + propInfo.Name); // only for consistency check
+        //    continue;
+        //  }
+        //}
 
         //var undefinedMembers = dict.Where(x => Guid.Parse(x.Key.Split('.')[0]) == typeInfo.StorableTypeAttribute.Guid);