Make FixedSizeSortedMap Serializable [18815]

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131626 13f79535-47bb-0310-9956-ffa450edef68

RELEASE-NOTES.html

@@ -34,6 +34,7 @@ No interface changes, or deprecations have occurred.
 <li>Fast3Map - Make Serializable [27946]</li>
 <li>Fast3Map - Add clone() method</li>
 <li>FixedSizeMap - Make Serializable [18815]</li>
+<li>FixedSizeSortedMap - Make Serializable [18815]</li>
 <li>MultiKey - Add getKey(index) and size() methods and make constructor public</li>
 <li>MultiHashMap - Add five methods to improve the API</li>
 <li>AbstractHashedMap,AbstractLinkedMap - Add methods to access entry methods when protected scope blocks</li>

src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java

@@ -15,6 +15,10 @@
  */
 package org.apache.commons.collections.map;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
@@ -39,13 +43,14 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * is not always unsupported.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision: 1.6 $ $Date: 2004/04/02 23:12:34 $
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
  */
 public class FixedSizeSortedMap
-        extends AbstractSortedMapDecorator implements SortedMap, BoundedMap {
+        extends AbstractSortedMapDecorator
+        implements SortedMap, BoundedMap, Serializable {
 
     /**
      * Factory method to create a fixed size sorted map.
@@ -68,13 +73,21 @@ public class FixedSizeSortedMap
         super(map);
     }
 
+    //-----------------------------------------------------------------------
     /**
-     * Gets the map being decorated.
-     * 
-     * @return the decorated map
+     * Write the map out using a custom routine.
      */
-    protected SortedMap getSortedMap() {
-        return (SortedMap) map;
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        out.defaultWriteObject();
+        out.writeObject(map);
+    }
+
+    /**
+     * Read the map in using a custom routine.
+     */
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        map = (Map) in.readObject();
     }
 
     //-----------------------------------------------------------------------

src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java

@@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:38 $
+ * @version $Revision: 1.6 $ $Date: 2004/04/02 23:12:34 $
  * 
  * @author Stephen Colebourne
  */
@@ -65,4 +65,33 @@ public class TestFixedSizeSortedMap extends AbstractTestSortedMap {
         return false;
     }
 
+    public String getCompatibilityVersion() {
+        return "3.1";
+    }
+    
+    public String[] ignoredTests() {
+        // TreeMap has a bug (it doesn't deserialize SubMaps properly), thus ignore...
+        return new String [] {
+            "TestFixedSizeSortedMap.bulkTestHeadMap.testEmptyMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestHeadMap.testFullMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestHeadMap.testSerializeDeserializeThenCompare",
+            "TestFixedSizeSortedMap.bulkTestTailMap.testEmptyMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestTailMap.testFullMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestTailMap.testSerializeDeserializeThenCompare",
+            "TestFixedSizeSortedMap.bulkTestSubMap.testEmptyMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestSubMap.testFullMapCompatibility",
+            "TestFixedSizeSortedMap.bulkTestSubMap.testSerializeDeserializeThenCompare",
+        };
+    }
+
+//    public void testCreate() throws Exception {
+//        resetEmpty();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "D:/dev/collections/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj");
+//        resetFull();
+//        writeExternalFormToDisk(
+//            (java.io.Serializable) map,
+//            "D:/dev/collections/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj");
+//    }
 }