Changeset 16485

Timestamp:

01/03/19 11:59:10 (5 years ago)

Author:

gkronber

Message:

#2520 replaced static type registration in HL.Persistence plugin with the KnownStorableTypesMap which is discovered and used by HEAL.Fossil.
As a consequence we do not need to explicitly call type registration for unit tests.
This change has been necessary because on the first access of StaticCache all StoraleTypes are registered. However, when the HL.Persistence plugin is loaded we have not yet loaded all plugins and as a consequence we would miss StorableTypes.

Location:

branches/2520_PersistenceReintegration

Files:

• HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Persistence/3.3/Transformers/KnownStorableTypesMap.cs (added)
• HeuristicLab.Tests/HeuristicLab.Persistence.Fossil/UseCases.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -139 +139 @@
     <Compile Include="Auxiliary\ReflectionTools.cs" />
     <Compile Include="Transformers\BitmapTransformer.cs" />
+    <Compile Include="Transformers\KnownStorableTypesMap.cs" />
     <Compile Include="Transformers\FontTransformer.cs" />
     <None Include="packages.config" />

branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Plugin.cs.frame

@@ -21 +21 @@
 
 using HeuristicLab.PluginInfrastructure;
-using HEAL.Fossil;
-using System;
 
 namespace HeuristicLab.Persistence {
@@ -32 +30 @@
   [PluginFile("HeuristicLab.Persistence-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Tracing", "3.3")]
-  public class HeuristicLabPersistencePlugin : PluginBase { 
-
-    // register types when the Plugin type is loaded
-    static HeuristicLabPersistencePlugin() {
-      RegisterStorableTypes();
-    }
-
-    // This method registers known StorableTypes for persistence.
-    // It will be called automatically when the plugin is loaded.
-    // For unit tests it must be called explicitly.
-    public static void RegisterStorableTypes() {
-      TryRegisterType(new Guid("ECC12A57-DA8D-43D9-9EC7-FCAC878A4D69"), typeof(System.Drawing.Font));
-      TryRegisterType(new Guid("494C1352-A1C3-47A3-8754-A0B19B8F1567"), typeof(System.Drawing.FontStyle));
-      TryRegisterType(new Guid("41147B67-4C7A-4907-9F6C-509568395EDB"), typeof(System.Drawing.GraphicsUnit));
-      TryRegisterType(new Guid("E8348C94-9817-4164-9C98-377689F83F30"), typeof(System.Drawing.Bitmap));
-
-       TryRegisterType(new Guid("4AF3A1F6-49CD-4172-8394-FE464889250E"), Type.GetType("System.CultureAwareRandomizedComparer"));
-       TryRegisterType(new Guid("4C7F657C-B69E-4D1A-8812-3254D6219FD2"), Type.GetType("System.OrdinalRandomizedComparer"));
-       TryRegisterType(new Guid("0549A3DF-1FD4-487A-B06B-8C572DFFFBEB"), Type.GetType("System.Security.PermissionTokenKeyComparer"));
-       TryRegisterType(new Guid("65D2DE74-8BDF-4C74-9005-81A2C3991DC5"), Type.GetType("System.Collections.CompatibleComparer"));
-       TryRegisterType(new Guid("075827F4-07D9-4E50-9D00-C9FF3E7DCF9A"), Type.GetType("System.Collections.IEqualityComparer"));
-       TryRegisterType(new Guid("3DA30D50-2337-4487-AECD-F2DB3ECED834"), Type.GetType("System.Collections.StructuralEqualityComparer"));
-       TryRegisterType(new Guid("8A19DA46-FE80-4776-9DB4-B17E6182D104"), Type.GetType("System.Collections.Generic.SByteEnumEqualityComparer`1"));
-       TryRegisterType(new Guid("F6F6EFB9-B631-4ACC-9326-F492A6A63011"), Type.GetType("System.Collections.Generic.ShortEnumEqualityComparer`1"));
-       TryRegisterType(new Guid("BA0AB604-C052-4E08-8F9E-A5D8098F16A6"), Type.GetType("System.Collections.Generic.RandomizedStringEqualityComparer"));
-       TryRegisterType(new Guid("00C8C940-63D9-43FF-99BA-9C69301BF043"), Type.GetType("System.Collections.Generic.RandomizedObjectEqualityComparer"));
-    }
-
-    private static void TryRegisterType(Guid typeGuid, Type type) {
-      try {
-        Mapper.StaticCache.RegisterType(typeGuid, type);
-      } catch (Exception) {
-        Tracing.Logger.Warn($"type {type} or guid {typeGuid} is already registerd.");
-      }
-    }
-  }
+  public class HeuristicLabPersistencePlugin : PluginBase { }
 }

branches/2520_PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence.Fossil/UseCases.cs

@@ -45 +45 @@
     public void CreateTempFile() {
       tempFile = Path.GetTempFileName();
-      // in HL this is not necessary because RegisterStorableTypes is called when the plugin is loaded
-      HeuristicLabPersistencePlugin.RegisterStorableTypes();
     }