Minor refactored wrt #10, update release notes

Author: cowtowncoder

release-notes/CREDITS

@@ -3,7 +3,12 @@ Here are individuals who have contributed to development of this project.
 
 Tatu Saloranta, [email protected]: author
 
-[email protected]:
+[email protected]
 
  * Reported [Issue#6]: broken handling of '\r' (on Windows)
   (0.7.2)
+
+Nathan Williams (nathanlws@github)
+
+ * Contributed #10: Add Iterator-based(pull-style) sorter as an alternative
+  (0.9.0)

release-notes/VERSION

@@ -1,23 +1,28 @@
 Project: java-merge-sort
 License: Apache License 2.0
-Version: 0.8.1
-Release date: 07-Aug-2013
+Version: 0.9.0
+Release date: xx-Oct-2013
 
-#8: Sorter._merge() not closing streams correctly
- (reported by tjoneslo@github)
+#10: Add Iterator-based (pull-style) sorter as an alternative
+ (contributed by Nathan W)
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+0.8.1 (07-Aug-2013)
+
+#8: Sorter._merge() not closing streams correctly
+ (reported by tjoneslo@github)
+
 0.8.0 (24-Jul-2013)
 
-* [Issue#6]: Incorrect handling of '\r'
+#6: Incorrect handling of '\r'
  (reported, patch contributed by [email protected])
 
 0.7.1 (29-May-2012)
 
-* [Issue#5]: Unnecessary object retention, leading to too high memory usage
+#5: Unnecessary object retention, leading to too high memory usage
  (reported by Paul Smith)
 
 

src/main/java/com/fasterxml/sort/IterableSorterException.java

@@ -0,0 +1,16 @@
+package com.fasterxml.sort;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * We need an unchecked exception to work with {@link Iterator}, and
+ * want a specific subtype to catch.
+ */
+public class IterableSorterException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public IterableSorterException(IOException cause) {
+        super(cause);
+    }
+}

src/main/java/com/fasterxml/sort/IteratingSorter.java

@@ -1,5 +1,6 @@
 package com.fasterxml.sort;
 
+import com.fasterxml.sort.util.CastingIterator;
 import com.fasterxml.sort.util.SegmentedBuffer;
 
 import java.io.Closeable;
@@ -137,50 +138,12 @@ public void close() {
         _merger = null;
     }
 
-
-    /*
-    /**********************************************************************
-    /* Exception API
-    /**********************************************************************
-    */
-
-    public static class IterableSorterException extends RuntimeException {
-        public IterableSorterException(IOException cause) {
-            super(cause);
-        }
-    }
-
-
     /*
     /**********************************************************************
-    /* Iterator API
+    /* Iterator implementations
     /**********************************************************************
     */
 
-    private static class CastingIterator<T> implements Iterator<T> {
-        private final Iterator<Object> _it;
-
-        public CastingIterator(Iterator<Object> it) {
-            _it = it;
-        }
-
-        @Override
-        public boolean hasNext() {
-            return _it.hasNext();
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public T next() {
-            return (T)_it.next();
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-    }
-
     private static class MergerIterator<T> implements Iterator<T> {
         private final DataReader<T> _merger;
         private T _next;

src/main/java/com/fasterxml/sort/util/CastingIterator.java

@@ -0,0 +1,27 @@
+package com.fasterxml.sort.util;
+
+import java.util.Iterator;
+
+public class CastingIterator<T> implements Iterator<T> {
+    private final Iterator<Object> _it;
+
+    public CastingIterator(Iterator<Object> it) {
+        _it = it;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return _it.hasNext();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T next() {
+        return (T)_it.next();
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+}