Changeset 5403

Timestamp:

02/01/11 12:40:12 (13 years ago)

Author:

epitzer

Message:

Support exporting types in type cache and add a support method for XmlGenerator to access this list (#1403)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Core/Serializer.cs (modified) (1 diff)
• Default/Xml/XmlGenerator.cs (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs

@@ -126 +126 @@
       }
       requiredFiles = new List<string>(files.Keys);
+    }
+
+    public IEnumerable<Type> SerializedTypes {
+      get {
+        return typeCache.Keys;
+      }
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -405 +405 @@
     public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies) {
       try {
-        using (StreamWriter writer = new StreamWriter(new GZipStream(stream, CompressionMode.Compress))) {
-          Serializer serializer = new Serializer(obj, config);
-          serializer.InterleaveTypeInformation = true;
-          XmlGenerator generator = new XmlGenerator();
-          foreach (ISerializationToken token in serializer) {
-            string line = generator.Format(token);
-            writer.Write(line);
-          }
-          writer.Flush();
+        Serializer serializer = new Serializer(obj, config);
+        Serialize(stream, serializer);
+      } catch (PersistenceException) {
+        throw;
+      } catch (Exception e) {
+        throw new PersistenceException("Unexpected exception during Serialization.", e);
+      }
+    }
+
+    /// <summary>
+    /// Serializes the specified object into a stream.
+    /// </summary>
+    /// <param name="obj">The object.</param>
+    /// <param name="stream">The stream.</param>
+    /// <param name="config">The configuration.</param>
+    /// <param name="includeAssemblies">if set to <c>true</c> include need assemblies.</param>
+    /// <param name="types">The list of all serialized types.</param>
+    public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, out IEnumerable<Type> types) {
+      try {
+        Serializer serializer = new Serializer(obj, config);
+        Serialize(stream, serializer);
+        types = serializer.SerializedTypes;
+      } catch (PersistenceException) {
+        throw;
+      } catch (Exception e) {
+        throw new PersistenceException("Unexpected exception during Serialization.", e);
+      }
+    }
+
+    private static void Serialize(Stream stream, Serializer serializer) {
+      using (StreamWriter writer = new StreamWriter(new GZipStream(stream, CompressionMode.Compress))) {
+        serializer.InterleaveTypeInformation = true;
+        XmlGenerator generator = new XmlGenerator();
+        foreach (ISerializationToken token in serializer) {
+          string line = generator.Format(token);
+          writer.Write(line);
         }
-      }
-      catch (PersistenceException) {
-        throw;
-      }
-      catch (Exception e) {
-        throw new PersistenceException("Unexpected exception during Serialization.", e);
+        writer.Flush();
       }
     }

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1228 +1228 @@
     }
 
+    [TestMethod]
+    public void TestTypeCacheExport() {
+      var test = new List<List<int>>();
+      test.Add(new List<int>() { 1, 2, 3 });
+      IEnumerable<Type> types;
+      using (var stream = new MemoryStream()) {
+        XmlGenerator.Serialize(test, stream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
+      }
+      List<Type> t = new List<Type>(types);
+      // Assert.IsTrue(t.Contains(typeof(int))); not serialized as an int list is directly transformed into a string
+      Assert.IsTrue(t.Contains(typeof(List<int>)));
+      Assert.IsTrue(t.Contains(typeof(List<List<int>>)));
+      Assert.AreEqual(t.Count, 2);
+    }
+