BUGFIX GridFS Upload / Problem with different buffer sizes since 4.2.0

Author: sfxcode

CHANGES.md

@@ -3,6 +3,10 @@
 
 ## Versions
 
+### 2.2.4
+* mongo-scala-driver [4.2.3](https://mongodb.github.io/mongo-java-driver/4.2/driver-scala/)
+* BUGFIX GridFS Upload / Problem with different buffer sizes since 4.2.0
+
 ### 2.2.3
 * rollback to mongo-scala-driver [4.1.2](https://mongodb.github.io/mongo-java-driver/4.2/driver-scala/) because of critical bug in GridFS Upload
 

build.sbt

@@ -55,7 +55,7 @@ libraryDependencies += "joda-time" % "joda-time" % "2.10.10" % Test
 
 libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.11" % Test
 
-libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.1.2"
+libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.2.3"
 
 libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.8.4" % Provided
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.5.1

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Base.scala

@@ -57,10 +57,9 @@ abstract class Base extends LazyLogging {
       fileName: String,
       file: File,
       metadata: AnyRef = Document(),
-      chunkSizeBytes: Int = 1204 * 256,
-      bufferSize: Int = 1024 * 64
+      chunkSizeBytes: Int = 1204 * 256
   ): Observable[ObjectId] =
-    upload(fileName, GridFSStreamObservable(file.newInputStream, bufferSize), metadata, chunkSizeBytes)
+    upload(fileName, GridFSStreamObservable(file.newInputStream, chunkSizeBytes), metadata, chunkSizeBytes)
 
   def download(oid: ObjectId): GridFSDownloadObservable =
     gridfsBucket.downloadToObservable(oid)

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Crud.scala

@@ -13,9 +13,8 @@ abstract class Crud extends Search {
       fileName: String,
       stream: InputStream,
       metadata: AnyRef = Document(),
-      chunkSizeBytes: Int = 1204 * 256,
-      bufferSize: Int = 1024 * 64
+      chunkSizeBytes: Int = 1204 * 256
   ): Observable[ObjectId] =
-    upload(fileName, GridFSStreamObservable(stream, bufferSize), metadata, chunkSizeBytes)
+    upload(fileName, GridFSStreamObservable(stream, chunkSizeBytes), metadata, chunkSizeBytes)
 
 }

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridFSDatabaseSpec.scala

@@ -26,8 +26,8 @@ class GridFSDatabaseSpec extends Specification with GridfsDatabaseFunctions with
       val fileName = "scala-logo.png"
 
       val filePath      = ImageDAOSourcePath + fileName
-      val oid: ObjectId = insertImage(filePath, ImageMetadata("template1", group = "templates"))
       val uploadBytes   = File(filePath).bytes.toList
+      val oid: ObjectId = insertImage(filePath, ImageMetadata("template1", group = "templates"))
 
       val file = findImage(oid)
       file.getFilename must be equalTo fileName

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridfsDatabaseFunctions.scala

@@ -26,7 +26,7 @@ trait GridfsDatabaseFunctions extends MongoImplicits {
 
   def insertImage(path: String, metadata: AnyRef): ObjectId = {
     val file = File(path)
-    ImageFilesDAO.insertOne(file.name, file.newInputStream, metadata, bufferSize = 1024 * 4)
+    ImageFilesDAO.insertOne(file.name, file.newInputStream, metadata)
   }
 
   def downloadImage(id: ObjectId, path: String): Long = {