Changeset 15035

Timestamp:

06/16/17 13:36:53 (8 years ago)

Author:

gkronber

Message:

#2520: made some changes related to renaming of storable members

Location:

branches/PersistenceReintegration

Files:

• HeuristicLab.Persistence/4.0/Core/StorableAttribute.cs (modified) (1 diff)
• HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs (modified) (4 diffs)
• HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs (modified) (5 diffs)

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/StorableAttribute.cs

@@ -64 +64 @@
     /// <summary>
     /// Allow storable attribute on properties with only a getter or a setter. These
-    /// properties will then by either only serialized but not deserialized or only
-    /// deserialized (if stored) but not serialized again.
+    /// properties will then by either only serialized (getter only) but not deserialized or only
+    /// deserialized (setter only) but not serialized again.
     /// </summary>
     public bool AllowOneWay { get; set; }

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

@@ -94 +94 @@
       }
 
+      Dictionary<string, object> lastDict = new Dictionary<string, object>();
       foreach (var convMeth in conversionMethods) {
         if (StorableConversionAttribute.GetVersion(convMeth) != version)
           throw new PersistenceException(string.Format("No conversion method defined for type {0} version {1}", typeGuid, version));
-        dict = (Dictionary<string, object>)convMeth.Invoke(null, new object[] { dict });
+        lastDict = (Dictionary<string, object>)convMeth.Invoke(null, new object[] { dict });
+        foreach (var kvp in lastDict) {
+          dict[kvp.Key] = kvp.Value;
+        }
         version++;
       }
@@ -117 +121 @@
 
       // set all members as generated by conversion method chain
-      foreach (var kvp in dict.ToArray()) {
+      foreach (var kvp in dict) {
         var key = kvp.Key;
         var val = kvp.Value;
@@ -124 +128 @@
           var field = (FieldInfo)fieldInfo.MemberInfo;
           field.SetValue(obj, val);
-          dict.Remove(fieldInfo.Name);
+          lastDict.Remove(fieldInfo.Name); // only for consistency check
           continue;
         }
@@ -131 +135 @@
           var prop = (PropertyInfo)propInfo.MemberInfo;
           prop.SetValue(obj, val, null);
-          dict.Remove(propInfo.Name);
+          lastDict.Remove(propInfo.Name);    // only for consistency check
           continue;
         }
       }
 
-      if (dict.Any())
+      if (lastDict.Any())
         throw new PersistenceException(string.Format("Invalid conversion method. The following members are undefined in type {0} version {1}: {2}",
           typeGuid, typeInfo.StorableTypeAttribute.Version,
-          string.Join(", ", dict.Keys)));
+          string.Join(", ", lastDict.Keys)));
 
       var emptyArgs = new object[0];

branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

@@ -2157 +2157 @@
       [Storable]
       public int y;
+
+      [Storable]
+      public string s;
     }
 
@@ -2184 +2187 @@
       [Storable]
       public Point coords;
+
+      [Storable(Name = "s")]
+      public string StorableString { get; set; }
     }
 
@@ -2202 +2208 @@
       [Storable]
       public Point coords;
+
+      [Storable(Name = "s", AllowOneWay = true)]
+      public string StorableString {  set { PublicString = value; } }
+      public string PublicString { get; set; }
     }
 
@@ -2253 +2263 @@
         var dv = new DoubleValue(1.0);
         p.items = new ItemCollection<IItem>(new IItem[] { dv, dv, p.a });
+        p.s = "123";
         return p;
       });
@@ -2277 +2288 @@
       // Assert.AreSame(restored.items[0], restored.items[1]);
       Assert.AreSame(restored, restored.mySelf);
-
+      Assert.AreEqual(restored.PublicString, old.s);
       //string msg = Profile(test);
       //Console.WriteLine(msg);