Changeset 14711 for branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Transformers

Timestamp:

03/03/17 11:41:43 (7 years ago)

Author:

gkronber

Message:

#2520

• renamed StorableClass -> StorableType
• changed persistence to use GUIDs instead of type names

Location:

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Transformers

Files:

• StorableClassTransformer.cs (modified) (1 diff)
• Transformers.cs (modified) (4 diffs)

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

@@ -30 +30 @@
   internal sealed class StorableClassBoxTransformer : BoxTransformer<object> {
     public override bool CanTransformType(Type type) {
-      return StorableClassAttribute.IsStorableClass(type) || type.BaseType != null && CanTransformType(type.BaseType);
+      return StorableTypeAttribute.IsStorableType(type) && !type.IsValueType || // don't transform structs
+        type.BaseType != null && CanTransformType(type.BaseType);
     }
 

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

@@ -32 +32 @@
 using Google.ProtocolBuffers;
 using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Persistence {
@@ -548 +549 @@
       foreach (var t in components) {
         string name = mapper.GetString(t.Key);
-        MemberInfo[] mis = type.GetMember(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+        MemberInfo[] mis = type.GetMember(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);        
         if (mis.Length != 1)
           throw new Exception("ambiguous struct member name " + name);
         MemberInfo mi = mis[0];
+        if(StorableAttribute.IsStorable(mi))
+          throw new PersistenceException("Don't use stroable attributes for structs as all fields are serialized automatically.");
         if (mi.MemberType == MemberTypes.Field)
           ((FieldInfo)mi).SetValue(obj, mapper.GetObject(t.Value));
@@ -916 +919 @@
         var comparer = propertyInfo.GetValue(value);
         var comparerType = comparer.GetType();
-        if (Default.CompositeSerializers.Storable.StorableClassAttribute.IsStorableClass(comparerType))
+        if (Default.CompositeSerializers.Storable.StorableTypeAttribute.IsStorableType(comparerType))
           uIntArrayBox.AddValues(mapper.GetBoxId(comparer));
         else if (comparerType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).Any())
@@ -986 +989 @@
 
       var comparerType = comparer.GetType();
-      if (Default.CompositeSerializers.Storable.StorableClassAttribute.IsStorableClass(comparerType))
+      if (Default.CompositeSerializers.Storable.StorableTypeAttribute.IsStorableType(comparerType))
         dictionaryBox.SetComparerId(mapper.GetBoxId(comparer));
       else if (comparerType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).Any())