Fix Reader testing streams

Author: silvanocerza

src/main/java/com/maxmind/db/BufferHolder.java

@@ -49,12 +49,16 @@ final class BufferHolder {
      * @throws NullPointerException if you provide a NULL InputStream
      */
     BufferHolder(InputStream stream) throws IOException {
+        this(stream, MultiBuffer.DEFAULT_CHUNK_SIZE);
+    }
+
+    BufferHolder(InputStream stream, int chunkSize) throws  IOException {
         if (null == stream) {
             throw new NullPointerException("Unable to use a NULL InputStream");
         }
         List<ByteBuffer> chunks = new ArrayList<>();
         long total = 0;
-        byte[] tmp = new byte[MultiBuffer.DEFAULT_CHUNK_SIZE];
+        byte[] tmp = new byte[chunkSize];
         int read;
 
         while (-1 != (read = stream.read(tmp))) {
@@ -65,7 +69,7 @@ final class BufferHolder {
             total += read;
         }
 
-        if (total <= MultiBuffer.DEFAULT_CHUNK_SIZE) {
+        if (total <= chunkSize) {
             byte[] data = new byte[(int) total];
             int pos = 0;
             for (ByteBuffer chunk : chunks) {
@@ -74,7 +78,7 @@ final class BufferHolder {
             }
             this.buffer = SingleBuffer.wrap(data);
         } else {
-            this.buffer = MultiBuffer.wrap(chunks.toArray(new ByteBuffer[0]));
+            this.buffer = new MultiBuffer(chunks.toArray(new ByteBuffer[0]), chunkSize);
         }
     }
 

src/main/java/com/maxmind/db/Reader.java

@@ -80,6 +80,10 @@ public Reader(InputStream source) throws IOException {
         this(source, NoCache.getInstance());
     }
 
+    Reader(InputStream source, int chunkSize) throws IOException {
+        this(source, NoCache.getInstance(), chunkSize);
+    }
+
     /**
      * Constructs a Reader with the specified backing cache, as if in mode
      * {@link FileMode#MEMORY}, without using a <code>File</code> instance.
@@ -89,7 +93,11 @@ public Reader(InputStream source) throws IOException {
      * @throws IOException if there is an error reading from the Stream.
      */
     public Reader(InputStream source, NodeCache cache) throws IOException {
-        this(new BufferHolder(source), "<InputStream>", cache);
+        this(source, cache, MultiBuffer.DEFAULT_CHUNK_SIZE);
+    }
+
+    Reader(InputStream source, NodeCache cache, int chunkSize) throws IOException {
+        this(new BufferHolder(source, chunkSize), "<InputStream>", cache);
     }
 
     /**

src/test/java/com/maxmind/db/MultiThreadedTest.java

@@ -29,7 +29,7 @@ public void multipleMmapOpens() throws InterruptedException,
     @Test
     public void streamThreadTest() throws IOException, InterruptedException,
         ExecutionException {
-        try (Reader reader = new Reader(ReaderTest.getStream("MaxMind-DB-test-decoder.mmdb"))) {
+        try (Reader reader = new Reader(ReaderTest.getStream("MaxMind-DB-test-decoder.mmdb"), 2048)) {
             MultiThreadedTest.threadTest(reader);
         }
     }

src/test/java/com/maxmind/db/ReaderTest.java

@@ -459,7 +459,7 @@ public void testNoIpV4SearchTreeFile() throws IOException {
 
     @Test
     public void testNoIpV4SearchTreeStream() throws IOException {
-        this.testReader = new Reader(getStream("MaxMind-DB-no-ipv4-search-tree.mmdb"));
+        this.testReader = new Reader(getStream("MaxMind-DB-no-ipv4-search-tree.mmdb"), 2048);
         this.testNoIpV4SearchTree(this.testReader);
     }
 
@@ -480,7 +480,7 @@ public void testDecodingTypesFile() throws IOException {
 
     @Test
     public void testDecodingTypesStream() throws IOException {
-        this.testReader = new Reader(getStream("MaxMind-DB-test-decoder.mmdb"));
+        this.testReader = new Reader(getStream("MaxMind-DB-test-decoder.mmdb"), 2048);
         this.testDecodingTypes(this.testReader, true);
         this.testDecodingTypesIntoModelObject(this.testReader, true);
         this.testDecodingTypesIntoModelObjectBoxed(this.testReader, true);
@@ -1140,7 +1140,7 @@ public void testBrokenDatabaseFile() throws IOException {
 
     @Test
     public void testBrokenDatabaseStream() throws IOException {
-        this.testReader = new Reader(getStream("GeoIP2-City-Test-Broken-Double-Format.mmdb"));
+        this.testReader = new Reader(getStream("GeoIP2-City-Test-Broken-Double-Format.mmdb"), 2048);
         this.testBrokenDatabase(this.testReader);
     }
 
@@ -1160,7 +1160,7 @@ public void testBrokenSearchTreePointerFile() throws IOException {
 
     @Test
     public void testBrokenSearchTreePointerStream() throws IOException {
-        this.testReader = new Reader(getStream("MaxMind-DB-test-broken-pointers-24.mmdb"));
+        this.testReader = new Reader(getStream("MaxMind-DB-test-broken-pointers-24.mmdb"), 2048);
         this.testBrokenSearchTreePointer(this.testReader);
     }
 
@@ -1178,7 +1178,7 @@ public void testBrokenDataPointerFile() throws IOException {
 
     @Test
     public void testBrokenDataPointerStream() throws IOException {
-        this.testReader = new Reader(getStream("MaxMind-DB-test-broken-pointers-24.mmdb"));
+        this.testReader = new Reader(getStream("MaxMind-DB-test-broken-pointers-24.mmdb"), 2048);
         this.testBrokenDataPointer(this.testReader);
     }