Changeset 1734

Timestamp:

05/04/09 16:50:34 (16 years ago)

Author:

epitzer

Message:

Serialization with streams. (#603)

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/PersistenceManager.cs (modified) (4 diffs)
• HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (1 diff)
• HeuristicLab.Persistence/UnitTests/UseCases.cs (modified) (14 diffs)

trunk/sources/HeuristicLab.Core/3.3/PersistenceManager.cs

@@ -28 +28 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Persistence.Default.Xml;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Core {
@@ -51 +52 @@
     /// <param name="stream">The (file) stream where the object should be saved.</param>
     public static void Save(IStorable instance, Stream stream) {
-      string tempfile = Path.GetTempFileName();
-      XmlGenerator.Serialize(instance, tempfile);
-      Stream reader = new FileStream(tempfile, FileMode.Open);
-      byte[] buffer = new byte[1024];
-      int bytesRead = 0;
-      do {
-        bytesRead = reader.Read(buffer, 0, buffer.Length);
-        stream.Write(buffer, 0, bytesRead);
-      } while (bytesRead > 0);
-      reader.Close();
-      stream.Close();
-      File.Delete(tempfile);
+      XmlGenerator.Serialize(instance, stream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()));      
     }
     /// <summary>
@@ -72 +62 @@
     /// <returns>The loaded object.</returns>
     public static IStorable Load(string filename) {
-      return (IStorable)XmlParser.DeSerialize(filename);
+      return (IStorable)XmlParser.Deserialize(filename);
     }
     /// <summary>
@@ -82 +72 @@
     /// <returns>The loaded object.</returns>
     public static IStorable Load(Stream stream) {
-      string tempfile = Path.GetTempFileName();
-      Stream writer = new FileStream(tempfile, FileMode.CreateNew);
-      byte[] buffer = new byte[1024];
-      int bytesRead = 0;
-      do {
-        bytesRead = stream.Read(buffer, 0, buffer.Length);
-        writer.Write(buffer, 0, bytesRead);
-      } while (bytesRead > 0);
-      stream.Close();
-      writer.Close();
-      object o = XmlParser.DeSerialize(tempfile);
-      File.Delete(tempfile);
-      return (IStorable)o;
+      return (IStorable)XmlParser.Deserialize(stream);
     }
 

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

@@ -122 +122 @@
     }
 
-    public static object DeSerialize(string filename) {
-      try {
-        ZipFile zipFile = new ZipFile(filename);
+    public static object Deserialize(string filename) {
+      return Deserialize(new ZipFile(filename));
+    }
+
+    public static object Deserialize(Stream stream) {
+      return Deserialize(new ZipFile(stream));
+    }
+
+    private static object Deserialize(ZipFile zipFile) {
+      try {        
         Deserializer deSerializer = new Deserializer(
           ParseTypeCache(

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -219 +219 @@
       r.uninitialized = null;
       XmlGenerator.Serialize(r, tempFile);
-      Root newR = (Root)XmlParser.DeSerialize(tempFile);
+      Root newR = (Root)XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(r),
@@ -283 +283 @@
       c.kvpList = new KeyValuePair<List<C>, C>(new List<C> { c }, c);
       XmlGenerator.Serialize(cs, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(cs),
@@ -315 +315 @@
       arrayListArray[2].Add(a);
       XmlGenerator.Serialize(arrayListArray, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(arrayListArray),
@@ -330 +330 @@
       Manager m = new Manager();
       XmlGenerator.Serialize(m, tempFile);
-      Manager newM = (Manager)XmlParser.DeSerialize(tempFile);
+      Manager newM = (Manager)XmlParser.Deserialize(tempFile);
       Assert.AreNotEqual(
         DebugStringGenerator.Serialize(m),
@@ -344 +344 @@
       PrimitivesTest sdt = new PrimitivesTest();
       XmlGenerator.Serialize(sdt, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(sdt),
@@ -357 +357 @@
       };
       XmlGenerator.Serialize(mDimString, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(mDimString),
@@ -372 +372 @@
       NestedType t = new NestedType();
       XmlGenerator.Serialize(t, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(t),
@@ -383 +383 @@
       string[] strings = { "ora", "et", "labora" };
       XmlGenerator.Serialize(strings, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(strings),
@@ -400 +400 @@
     public void PrimitiveRoot() {
       XmlGenerator.Serialize(12.3f, tempFile);
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(12.3f),
@@ -456 +456 @@
             new StorableDecomposer(),
             new Number2StringDecomposer() }));
-      object o = XmlParser.DeSerialize(tempFile);
+      object o = XmlParser.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(sdt),
@@ -467 +467 @@
       et.OnChange += (o) => o;
       XmlGenerator.Serialize(et, tempFile);
-      EventTest newEt = (EventTest)XmlParser.DeSerialize(tempFile);
+      EventTest newEt = (EventTest)XmlParser.Deserialize(tempFile);
     }
 
@@ -477 +477 @@
       et.trickyEnum = TrickyEnum.two | TrickyEnum.one;
       XmlGenerator.Serialize(et, tempFile);
-      EnumTest newEt = (EnumTest)XmlParser.DeSerialize(tempFile);
+      EnumTest newEt = (EnumTest)XmlParser.Deserialize(tempFile);
       Assert.AreEqual(et.simpleEnum, SimpleEnum.two);
       Assert.AreEqual(et.complexEnum, ComplexEnum.three);
@@ -491 +491 @@
       Assert.AreNotSame(ints[0], ints[1]);
       XmlGenerator.Serialize(ints, tempFile);
-      List<IntWrapper> newInts = (List<IntWrapper>)XmlParser.DeSerialize(tempFile);
+      List<IntWrapper> newInts = (List<IntWrapper>)XmlParser.Deserialize(tempFile);
       Assert.AreEqual(newInts[0].Value, 1);
       Assert.AreEqual(newInts[1].Value, 1);
@@ -517 +517 @@
         Assert.Fail("Exception expected");
       } catch (PersistenceException) { }
-      List<int> newList = (List<int>)XmlParser.DeSerialize(tempFile);
+      List<int> newList = (List<int>)XmlParser.Deserialize(tempFile);
       Assert.AreEqual(list[0], newList[0]);
       Assert.AreEqual(list[1], newList[1]);