Changeset 8500

Timestamp:

08/18/12 21:21:30 (12 years ago)

Author:

ascheibe

Message:

#1861 applied persistence patches

Location:

branches/HeuristicLab.Mono/HeuristicLab.Persistence/3.3

Files:

• Auxiliary/ObjectEqualityComparer.cs (added)
• Auxiliary/TypeLoader.cs (modified) (1 diff)
• Auxiliary/TypeName.cs (modified) (1 diff)
• Default/CompositeSerializers/TypeSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.Mono/HeuristicLab.Persistence/3.3/Auxiliary/TypeLoader.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Persistence.Auxiliary {
-
-  internal class TypeLoader {
-
-    public static Type Load(string typeNameString) {
-      Type type;
-      try {
-        type = Type.GetType(typeNameString, true);
-      }
-      catch (Exception) {
-        Logger.Warn(String.Format(
-          "Cannot load type \"{0}\", falling back to partial name", typeNameString));
-        try {
-          TypeName typeName = TypeNameParser.Parse(typeNameString);
+  
+  internal class TypeLoader {
+    
+    public static Type Load(string typeNameString) {
+      try {
+        // try to load type normally
+        return LoadInternal(typeNameString);
+      } catch (PersistenceException) {
+        // if that fails, try to load mono type
+        string monoTypeNameString = GetMonoType(typeNameString);
+        Logger.Info(String.Format(@"Trying to load Mono type ""{0}"" instead of type ""{1}""",
+                                  monoTypeNameString, typeNameString));
+        return LoadInternal(monoTypeNameString);
+      }
+    }
+    
+    private static Type LoadInternal(string typeNameString) {
+      Type type;
+      try {
+        type = Type.GetType(typeNameString, true);
+        // TODO: workaround until [mono bug #580](http://bugzilla.xamarin.com/show_bug.cgi?id=580) is fixed
+        if(type.AssemblyQualifiedName != typeNameString)
+          throw new TypeLoadException(
+            String.Format(
+            @"Could not load requested type ""{0}"", loaded ""{1}"" instead.",
+            typeNameString, type.AssemblyQualifiedName));
+      }
+      catch (Exception) {
+        Logger.Warn(String.Format(
+          "Cannot load type \"{0}\", falling back to partial name", typeNameString));
+        type = LoadWithPartialName(typeNameString);
+        CheckCompatibility(typeNameString, type);
+      }
+      return type;
+    }
+    
+    private static Type LoadWithPartialName(string typeNameString) {
+      try {
+        TypeName typeName = TypeNameParser.Parse(typeNameString);
 #pragma warning disable 0618
-          Assembly a = Assembly.LoadWithPartialName(typeName.AssemblyName);
-          // the suggested Assembly.Load() method fails to load assemblies outside the GAC
+        Assembly a = Assembly.LoadWithPartialName(typeName.AssemblyName);
+        // the suggested Assembly.Load() method fails to load assemblies outside the GAC
 #pragma warning restore 0618
-          type = a.GetType(typeName.ToString(false, false), true);
-        }
-        catch (Exception) {
-          throw new PersistenceException(String.Format(
-            "Could not load type \"{0}\"",
-            typeNameString));
-        }
-        try {
-          TypeName requestedTypeName = TypeNameParser.Parse(typeNameString);
-          TypeName loadedTypeName = TypeNameParser.Parse(type.AssemblyQualifiedName);
-          if (!requestedTypeName.IsCompatible(loadedTypeName))
-            throw new PersistenceException(String.Format(
-              "Serialized type is incompatible with available type: serialized: {0}, loaded: {1}",
-              typeNameString,
-              type.AssemblyQualifiedName));
-          if (requestedTypeName.IsNewerThan(loadedTypeName))
-            throw new PersistenceException(String.Format(
-              "Serialized type is newer than available type: serialized: {0}, loaded: {1}",
-              typeNameString,
-              type.AssemblyQualifiedName));
-        }
-        catch (PersistenceException) {
-          throw;
-        }
-        catch (Exception e) {
-          Logger.Warn(String.Format(
-            "Could not perform version check requested type was {0} while loaded type is {1}:",
-            typeNameString,
-            type.AssemblyQualifiedName),
-            e);
-        }
-      }
-      return type;
-    }
-  }
+        return a.GetType(typeName.ToString(false, false), true);
+      }
+      catch (Exception) {
+        throw new PersistenceException(String.Format(
+          "Could not load type \"{0}\"",
+          typeNameString));
+      }
+    }
+    
+    private static void CheckCompatibility(string typeNameString, Type type) {
+      try {
+        TypeName requestedTypeName = TypeNameParser.Parse(typeNameString);
+        TypeName loadedTypeName = TypeNameParser.Parse(type.AssemblyQualifiedName);
+        if (!requestedTypeName.IsCompatible(loadedTypeName))
+          throw new PersistenceException(String.Format(
+            "Serialized type is incompatible with available type: serialized: {0}, loaded: {1}",
+            typeNameString,
+            type.AssemblyQualifiedName));
+        if (requestedTypeName.IsNewerThan(loadedTypeName))
+          throw new PersistenceException(String.Format(
+            "Serialized type is newer than available type: serialized: {0}, loaded: {1}",
+            typeNameString,
+            type.AssemblyQualifiedName));
+      }
+      catch (PersistenceException) {
+        throw;
+      }
+      catch (Exception e) {
+        Logger.Warn(String.Format(
+          "Could not perform version check requested type was {0} while loaded type is {1}:",
+          typeNameString,
+          type.AssemblyQualifiedName),
+                    e);
+      }
+    }
+    
+    /// <summary>
+    /// Returns the corresponding type for the Mono runtime
+    /// </summary>
+    /// <returns>
+    /// The remapped typeNameString, or the original string if no mapping was found
+    /// </returns>
+    /// <param name='typeNameString'>
+    /// Type name string.
+    /// </param>
+    private static string GetMonoType(string typeNameString) {
+      TypeName typeName = TypeNameParser.Parse(typeNameString);
+      
+      // map System.RuntimeType to System.MonoType
+      if(typeName.Namespace == "System" && typeName.ClassName == "RuntimeType") {
+        //TODO: use preprocessor and __MonoCS__ 
+        typeName = TypeNameParser.Parse("System.MonoType, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
+      } else
+        // map System.Collections.Generic.ObjectEqualityComparer to HeuristicLab.Mono.ObjectEqualityComparer
+      if(typeName.Namespace == "System.Collections.Generic" && typeName.ClassName == "ObjectEqualityComparer") {
+        TypeName oecInfo = TypeNameParser.Parse(typeof(TypeName).AssemblyQualifiedName);
+        typeName.Namespace = "HeuristicLab.Persistence.Mono";
+        typeName.AssemblyName = oecInfo.AssemblyName;
+        typeName.AssemblyAttribues.Clear();
+        typeName.AssemblyAttribues["Version"] = oecInfo.AssemblyAttribues["Version"];
+        typeName.AssemblyAttribues["Culture"] = oecInfo.AssemblyAttribues["Culture"];
+        typeName.AssemblyAttribues["PublicKeyToken"] = oecInfo.AssemblyAttribues["PublicKeyToken"];
+      }
+      
+      return typeName.ToString(true, true);
+    }
+  }
 }

branches/HeuristicLab.Mono/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

@@ -41 +41 @@
     /// <value>The namespace.</value>
     [Storable]
-    public string Namespace { get; private set; }
+    public string Namespace { get; internal set; }
 
     /// <summary>

branches/HeuristicLab.Mono/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

@@ -40 +40 @@
     }
 
-    public bool CanSerialize(Type type) {
-      return type == typeof(Type) ||
-             type.VersionInvariantName() == "System.RuntimeType, mscorlib";
-    }
+  public bool CanSerialize(Type type) {
+    return type == typeof(Type) ||
+      type.VersionInvariantName() == "System.RuntimeType, mscorlib" ||
+      type.VersionInvariantName() == "System.MonoType, mscorlib";
+  }
 
     public string JustifyRejection(Type type) {
-      return "not System.Type nor System.RuntimeType";
+    return "not System.Type, System.RuntimeType nor System.MonoType";
     }
 

branches/HeuristicLab.Mono/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -129 +129 @@
     <Compile Include="Auxiliary\TypeNameParser.cs" />
     <Compile Include="Auxiliary\ReflectionTools.cs" />
+    <Compile Include="Auxiliary\ObjectEqualityComparer.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Core\Configuration.cs" />