JAVA-851: disable check for upper bound on chunkSize in GridFS

Author: trnl

src/main/com/mongodb/gridfs/GridFS.java

@@ -54,8 +54,13 @@ public class GridFS {
 
     /**
      * file's max chunk size
+     *
+     * @deprecated You can calculate max chunkSize with
+     *             a similar formula {@link com.mongodb.MongoClient#getMaxBsonObjectSize()} - 500*1000.
+     *             Please ensure that you left enough space for metadata (500kb is enough).
      */
-    public static final long MAX_CHUNKSIZE = (long)(3.5 * 1000 * 1000);
+    @Deprecated
+    public static final long MAX_CHUNKSIZE = (long) (3.5 * 1000 * 1000);
 
     /**
      * bucket to use for the collection namespaces

src/main/com/mongodb/gridfs/GridFSInputFile.java

@@ -215,8 +215,8 @@ public int saveChunks( long chunkSize ) throws IOException {
         if ( _savedChunks )
             throw new MongoException( "chunks already saved!" );
 
-        if ( chunkSize <= 0 || chunkSize > GridFS.MAX_CHUNKSIZE ) {
-            throw new MongoException( "chunkSize must be greater than zero and less than or equal to GridFS.MAX_CHUNKSIZE");
+        if ( chunkSize <= 0) {
+            throw new MongoException("chunkSize must be greater than zero");
         }
 
         if ( _chunkSize != chunkSize ) {

src/test/com/mongodb/gridfs/GridFSTest.java

@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.Random;
 
 public class GridFSTest extends TestCase {
 
@@ -146,7 +147,7 @@ public void testMetadata()
 
     @Test(groups = {"basic"})
     public void testBadChunkSize() throws Exception {
-        int fileSize = (int)(2 * GridFS.MAX_CHUNKSIZE);
+        int fileSize = 2 * _db.getMongo().getMaxBsonObjectSize();
         if (fileSize > 1024 * 1024 * 1024)
             //If this is the case, GridFS is probably obsolete...
             fileSize = 10 * 1024 * 1024;
@@ -165,16 +166,8 @@ public void testBadChunkSize() throws Exception {
             assertTrue(mongoExc.toString().contains("chunkSize must be greater than zero"));
         }
 
-        try{
-            inputFile.save(GridFS.MAX_CHUNKSIZE + 10);
-            fail("should have received an exception about a chunk size being too big");
-        }catch(MongoException mongoExc) {
-            //also expecting it to complain about the chunkSize
-            assertTrue(mongoExc.toString().contains("and less than or equal to GridFS.MAX_CHUNKSIZE"));
-        }
-
         //For good measure let's save and restore the bytes
-        inputFile.save(GridFS.MAX_CHUNKSIZE / 2);
+        inputFile.save(_db.getMongo().getMaxBsonObjectSize() - 500 * 1000);
         GridFSDBFile savedFile = _fs.findOne(new BasicDBObject("_id", inputFile.getId()));
         ByteArrayOutputStream savedFileByteStream = new ByteArrayOutputStream();
         savedFile.writeTo(savedFileByteStream);