Changeset 17097 for stable/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableAttribute.cs (deleted)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAttribute.cs (deleted)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassType.cs (deleted)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableConstructorAttribute.cs (deleted)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs (deleted)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs (modified) (2 diffs)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs (modified) (6 diffs)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (6 diffs)

stable/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.Reflection;
 using System.Text;
-using HeuristicLab.Persistence.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {

stable/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 using System.Linq;
 using System.Reflection;
-using HeuristicLab.Persistence.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {
@@ -43 +43 @@
         storableMembers.AddRange(GenerateStorableMembers(type.BaseType));
 
-      var storableClassAttribute = GetStorableClassAttribute(type);
-      if (storableClassAttribute != null) {
-        switch (storableClassAttribute.Type) {
-          case StorableClassType.MarkedOnly:
+      var storableTypeAttribute = GetStorableTypeAttribute(type);
+      if (storableTypeAttribute != null) {
+        switch (storableTypeAttribute.MemberSelection) {
+          case StorableMemberSelection.MarkedOnly:
             AddMarkedMembers(type, storableMembers); break;
-          case StorableClassType.AllFields:
+          case StorableMemberSelection.AllFields:
             AddAll(type, MemberTypes.Field, storableMembers); break;
-          case StorableClassType.AllProperties:
+          case StorableMemberSelection.AllProperties:
             AddAll(type, MemberTypes.Property, storableMembers); break;
-          case StorableClassType.AllFieldsAndAllProperties:
+          case StorableMemberSelection.AllFieldsAndAllProperties:
             AddAll(type, MemberTypes.Field | MemberTypes.Property, storableMembers); break;
           default:
-            throw new PersistenceException("unsupported [StorableClassType]: " + storableClassAttribute.Type);
+            throw new PersistenceException("unsupported [StorableMemberSelection]: " + storableTypeAttribute.MemberSelection);
         }
       }
@@ -62 +62 @@
 
     public static bool IsEmptyOrStorableType(Type type, bool recursive) {
-      if (!HasStorableClassAttribute(type) && !IsEmptyType(type, false)) return false;
+      if (!HasStorableTypeAttribute(type) && !IsEmptyType(type, false)) return false;
       return !recursive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
     }
@@ -72 +72 @@
         foreach (var hook in CollectHooks(hookType, type.BaseType))
           yield return hook;
-      if (HasStorableClassAttribute(type)) {
+      if (HasStorableTypeAttribute(type)) {
         foreach (MethodInfo methodInfo in type.GetMethods(DECLARED_INSTANCE_MEMBERS)) {
           if (methodInfo.ReturnType == typeof(void) && methodInfo.GetParameters().Length == 0) {
@@ -174 +174 @@
     #region [StorableClass] helpers
 
-    private static StorableClassAttribute GetStorableClassAttribute(Type type) {
-      lock (storableClassCache) {
-        if (storableClassCache.ContainsKey(type))
-          return storableClassCache[type];
-        StorableClassAttribute attribute = type
-          .GetCustomAttributes(typeof(StorableClassAttribute), false)
-          .SingleOrDefault() as StorableClassAttribute;
-        storableClassCache.Add(type, attribute);
+    private static StorableTypeAttribute GetStorableTypeAttribute(Type type) {
+      lock (storableTypeCache) {
+        if (storableTypeCache.ContainsKey(type))
+          return storableTypeCache[type];
+        StorableTypeAttribute attribute = type
+          .GetCustomAttributes(typeof(StorableTypeAttribute), false)
+          .SingleOrDefault() as StorableTypeAttribute;
+        storableTypeCache.Add(type, attribute);
         return attribute;
       }
     }
 
-    public static bool HasStorableClassAttribute(Type type) {
-      return GetStorableClassAttribute(type) != null;
-    }
-
-    private static Dictionary<Type, StorableClassAttribute> storableClassCache =
-      new Dictionary<Type, StorableClassAttribute>();
+    public static bool HasStorableTypeAttribute(Type type) {
+      return GetStorableTypeAttribute(type) != null;
+    }
+
+    private static Dictionary<Type, StorableTypeAttribute> storableTypeCache =
+      new Dictionary<Type, StorableTypeAttribute>();
 
     #endregion

stable/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using System.Reflection.Emit;
 using System.Text;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Interfaces;
@@ -38 +39 @@
   /// or <c>AllFieldsAndAllProperties</c>.
   /// </summary>
-  [StorableClass]
+  [StorableType("F60343E8-4337-4171-A50A-6A57D09267ED")]
   public sealed class StorableSerializer : ICompositeSerializer {
 
@@ -49 +50 @@
 
     [StorableConstructor]
-    private StorableSerializer(bool deserializing) : this() { }
+    private StorableSerializer(StorableConstructorFlag _) { }
 
     #region ICompositeSerializer implementation
@@ -69 +70 @@
     /// </returns>
     public bool CanSerialize(Type type) {
-      var markedStorable = StorableReflection.HasStorableClassAttribute(type);
+      if (type.IsEnum || type.IsValueType) return false; // there are other more specific serializers for enums and structs
+      var markedStorable = StorableReflection.HasStorableTypeAttribute(type);
       if (GetConstructor(type) == null)
-        if (markedStorable)
+        if (markedStorable && !type.IsInterface)
           throw new Exception("[Storable] type has no default constructor and no [StorableConstructor]");
         else
           return false;
       if (!StorableReflection.IsEmptyOrStorableType(type, true))
-        if (markedStorable)
+        if (markedStorable && !type.IsInterface)
           throw new Exception("[Storable] type has non emtpy, non [Storable] base classes");
         else
@@ -240 +242 @@
         .Where(ci => ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0)) {
         if (ci.GetParameters().Length != 1 ||
-            ci.GetParameters()[0].ParameterType != typeof(bool))
-          throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
+            ci.GetParameters()[0].ParameterType != typeof(StorableConstructorFlag))
+          throw new PersistenceException("StorableConstructor must have exactly one argument of type StorableConstructorFlag");
         var dm = new DynamicMethod("", typeof(object), null, type, true);
         var ilgen = dm.GetILGenerator();
-        ilgen.Emit(OpCodes.Ldc_I4_1); // load true
+        var defaultFlagFieldInfo = typeof(StorableConstructorFlag).GetField("Default", BindingFlags.Static | BindingFlags.Public);
+        ilgen.Emit(OpCodes.Ldsfld, defaultFlagFieldInfo); // load the object
         ilgen.Emit(OpCodes.Newobj, ci);
         ilgen.Emit(OpCodes.Ret);