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

Timestamp:

04/29/09 15:32:59 (16 years ago)

Author:

epitzer

Message:

Check for default constructor in all decomposers to ensure failure during serialization instead of deserialization. (#606)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers

Files:

• DictionaryDecomposer.cs (modified) (3 diffs)
• EnumerableDecomposer.cs (modified) (2 diffs)
• NumberEnumerable2StringDecomposer.cs (modified) (2 diffs)
• Storable/StorableDecomposer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/DictionaryDecomposer.cs

@@ -5 +5 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -17 +18 @@
 
     public bool CanDecompose(Type type) {
-      return type.GetInterface(typeof(IDictionary).FullName) != null;
+      return ReflectionTools.HasDefaultConstructor(type) &&
+        type.GetInterface(typeof(IDictionary).FullName) != null;
     }
 
@@ -54 +56 @@
       } catch (ArgumentException e) {
         throw new PersistenceException("Duplicate dictionary key.", e);
-      }      
+      }
     }
   }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/EnumerableDecomposer.cs

@@ -6 +6 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -19 +20 @@
     public bool CanDecompose(Type type) {
       return
+        ReflectionTools.HasDefaultConstructor(type) &&
         type.GetInterface(typeof(IEnumerable).FullName) != null &&
         type.GetMethod("Add") != null &&

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/NumberEnumerable2StringDecomposer.cs

@@ -7 +7 @@
 using System.Text;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -54 +55 @@
     public bool CanDecompose(Type type) {
       return
+        ReflectionTools.HasDefaultConstructor(type) &&
         ImplementsGenericEnumerable(type) &&
         HasAddMethod(type);

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/Storable/StorableDecomposer.cs

@@ -4 +4 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core;
+using System.Reflection;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers.Storable {
@@ -15 +17 @@
 
     public bool CanDecompose(Type type) {
-      return StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
-        EmptyStorableClassAttribute.IsEmptyStorable(type);
+      return ReflectionTools.HasDefaultConstructor(type) &&
+        (StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
+          EmptyStorableClassAttribute.IsEmptyStorable(type));
 
     }
@@ -26 +29 @@
     public IEnumerable<Tag> Decompose(object obj) {
       foreach (var mapping in StorableAttribute.GetStorableAccessors(obj)) {
-        yield return new Tag(mapping.Value.Name ?? mapping.Key, mapping.Value.Get());        
+        yield return new Tag(mapping.Value.Name ?? mapping.Key, mapping.Value.Get());
       }
     }