Changeset 1852 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

05/19/09 17:07:55 (16 years ago)

Author:

epitzer

Message:

Correct handling of empty storable classes. (#603)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable

Files:

• DataMemberAccessor.cs (modified) (1 diff)
• EmptyStorableClassAttribute.cs (modified) (3 diffs)
• StorableAttribute.cs (modified) (1 diff)
• StorableSerializer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/DataMemberAccessor.cs

@@ -6 +6 @@
 
   public class DataMemberAccessor {
-    
-    public readonly Func<object> Get;    
+
+    public readonly Func<object> Get;
     public readonly Action<object> Set;
     public readonly string Name;

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/EmptyStorableClassAttribute.cs

@@ -4 +4 @@
 
 namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {
-
 
   [AttributeUsage(
@@ -14 +13 @@
     private static readonly Dictionary<Type, bool> emptyTypeInfo = new Dictionary<Type, bool>();
 
+    private const BindingFlags BINDING_FLAGS =
+      BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
+
+    /// <summary>
+    /// Check if supplied type is empty (i.e. no properties or fields) or is marked as empty storable.
+    /// This method is not recusrice and does not check if base types are also empty.
+    /// </summary>    
     public static bool IsEmptyStorable(Type type) {
       if (emptyTypeInfo.ContainsKey(type))
@@ -20 +26 @@
         return true;
       }
-      foreach (var attribute in type.GetCustomAttributes(false)) {
-        EmptyStorableClassAttribute empty = attribute as EmptyStorableClassAttribute;
-        if (empty != null) {
+      foreach (var attribute in type.GetCustomAttributes(false)) {        
+        if (attribute as EmptyStorableClassAttribute != null) {
           emptyTypeInfo.Add(type, true);
           return true;
         }
-      }
-      int nFields = 0;
-      foreach (MemberInfo memberInfo in type.GetMembers(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) {
-        if (memberInfo.MemberType == MemberTypes.Field ||
-          memberInfo.MemberType == MemberTypes.Property)
-          nFields += 1;
-      }
-      if (nFields == 0) {
-        emptyTypeInfo.Add(type, true);
-        return true;
-      }
-      emptyTypeInfo.Add(type, false);
-      return false;
+      }      
+      foreach (MemberInfo memberInfo in type.GetMembers(BINDING_FLAGS)) {
+        if ( 
+          memberInfo.MemberType == MemberTypes.Field && IsModifiableField((FieldInfo)memberInfo) ||          
+          memberInfo.MemberType == MemberTypes.Property && IsModifiableProperty((PropertyInfo)memberInfo) ) {
+          emptyTypeInfo.Add(type, false);
+          return false;
+        }          
+      }      
+      emptyTypeInfo.Add(type, true);
+      return true;            
+    }
+
+    public static bool IsModifiableField(FieldInfo fi) {      
+      return !fi.IsLiteral && !fi.IsInitOnly;
+    }
+    public static bool IsModifiableProperty(PropertyInfo pi) {
+      return pi.CanWrite;
     }
   }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableAttribute.cs

@@ -26 +26 @@
     public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>
         GetStorableMembers(Type type, bool inherited) {
-      if (type.BaseType != null)
+      if (inherited && type.BaseType != null)
         foreach (var pair in GetStorableMembers(type.BaseType))
           yield return pair;

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -17 +17 @@
 
     public bool CanSerialize(Type type) {
-      return ReflectionTools.HasDefaultConstructor(type) &&
-        (StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
-          EmptyStorableClassAttribute.IsEmptyStorable(type));
-
+      if (!ReflectionTools.HasDefaultConstructor(type))
+        return false;
+      while (type != null) {        
+        if (StorableAttribute.GetStorableMembers(type, false).Count() == 0 &&
+            !EmptyStorableClassAttribute.IsEmptyStorable(type))
+          return false;
+        type = type.BaseType;
+      }
+      return true;
     }