models added

Author: sfxcode

build.sbt

@@ -47,14 +47,14 @@ libraryDependencies += "joda-time" % "joda-time" % "2.10.5" % Test
 
 libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.7" % Test
 
-libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.8.0" % Test
-
-libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.0.2"
-
 libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.7.3" % Provided
 
 libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.4-9" % Provided
 
+libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.0.2"
+
+libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.8.0"
+
 libraryDependencies += "com.typesafe" % "config" % "1.4.0"
 
 libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"

src/main/scala/com/sfxcode/nosql/mongo/database/MongoConfig.scala

@@ -12,16 +12,17 @@ import org.mongodb.scala.{ MongoClientSettings, MongoCredential, ServerAddress }
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
 
-case class MongoConfig(database: String,
-                       host: String = DefaultHost,
-                       port: Int = DefaultPort,
-                       applicationName: String = DefaultApplicationName,
-                       userName: Option[String] = None,
-                       password: Option[String] = None,
-                       authDatabase: String = DefaultAuthenticationDatabaseName,
-                       poolOptions: MongoPoolOptions = MongoPoolOptions(),
-                       compressors: List[String] = List(),
-                       customClientSettings: Option[MongoClientSettings] = None) {
+case class MongoConfig(
+  database: String,
+  host: String = DefaultHost,
+  port: Int = DefaultPort,
+  applicationName: String = DefaultApplicationName,
+  userName: Option[String] = None,
+  password: Option[String] = None,
+  authDatabase: String = DefaultAuthenticationDatabaseName,
+  poolOptions: MongoPoolOptions = MongoPoolOptions(),
+  compressors: List[String] = List(),
+  customClientSettings: Option[MongoClientSettings] = None) {
 
   val clientSettings: MongoClientSettings = {
     if (customClientSettings.isDefined) {
@@ -53,8 +54,7 @@ case class MongoConfig(database: String,
         .builder()
         .applicationName(applicationName)
         .applyToConnectionPoolSettings(
-          (b: com.mongodb.connection.ConnectionPoolSettings.Builder) => b.applySettings(connectionPoolSettings)
-        )
+          (b: com.mongodb.connection.ConnectionPoolSettings.Builder) => b.applySettings(connectionPoolSettings))
         .applyToClusterSettings((b: com.mongodb.connection.ClusterSettings.Builder) => b.applySettings(clusterSettings))
         .compressorList(compressorList.asJava)
 
@@ -70,20 +70,20 @@ case class MongoConfig(database: String,
 }
 
 object MongoConfig {
-  val DefaultHost                       = "127.0.0.1"
-  val DefaultPort                       = 27017
+  val DefaultHost = "127.0.0.1"
+  val DefaultPort = 27017
   val DefaultAuthenticationDatabaseName = "admin"
-  val DefaultApplicationName            = "simple-mongo-app"
+  val DefaultApplicationName = "simple-mongo-app"
 
-  val DefaultPoolMaxConnectionIdleTime   = 60
-  val DefaultPoolMaxSize                 = 50
-  val DefaultPoolMinSize                 = 0
-  val DefaultPoolMaxWaitQueueSize        = 500
+  val DefaultPoolMaxConnectionIdleTime = 60
+  val DefaultPoolMaxSize = 50
+  val DefaultPoolMinSize = 0
+  val DefaultPoolMaxWaitQueueSize = 500
   val DefaultPoolMaintenanceInitialDelay = 0
 
   val ComressionSnappy = "snappy"
-  val ComressionZlib   = "zlib"
-  val ComressionZstd   = "zstd"
+  val ComressionZlib = "zlib"
+  val ComressionZstd = "zstd"
 
   val DefaultConfigPathPrefix = "mongo"
 
@@ -122,19 +122,18 @@ object MongoConfig {
         List()
       }
 
-    val host            = stringConfig("host", DefaultHost).get
-    val database        = stringConfig("database").get
-    val userName        = stringConfig("userName")
-    val password        = stringConfig("password")
-    val authDatabase    = stringConfig("authDatabase", DefaultAuthenticationDatabaseName).get
+    val host = stringConfig("host", DefaultHost).get
+    val database = stringConfig("database").get
+    val userName = stringConfig("userName")
+    val password = stringConfig("password")
+    val authDatabase = stringConfig("authDatabase", DefaultAuthenticationDatabaseName).get
     val applicationName = stringConfig("applicationName", DefaultApplicationName).get
 
     val poolOptions = MongoPoolOptions(
       poolOptionsConfig("maxConnectionIdleTime", DefaultPoolMaxConnectionIdleTime),
       poolOptionsConfig("maxSize", DefaultPoolMaxSize),
       poolOptionsConfig("minSize", DefaultPoolMinSize),
-      poolOptionsConfig("maintenanceInitialDelay", DefaultPoolMaintenanceInitialDelay)
-    )
+      poolOptionsConfig("maintenanceInitialDelay", DefaultPoolMaintenanceInitialDelay))
 
     MongoConfig(database, host, port, applicationName, userName, password, authDatabase, poolOptions, compressors)
   }

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

@@ -3,6 +3,7 @@ package com.sfxcode.nosql.mongo.gridfs
 import java.io.OutputStream
 import java.nio.ByteBuffer
 
+import better.files.File
 import com.mongodb.client.gridfs.model.GridFSUploadOptions
 import com.sfxcode.nosql.mongo.Converter
 import com.typesafe.scalalogging.LazyLogging
@@ -51,10 +52,21 @@ abstract class Base extends LazyLogging {
     gridfsBucket.uploadFromObservable(fileName, source, options)
   }
 
+  def uploadFile(
+    fileName: String,
+    file: File,
+    metadata: AnyRef = Document(),
+    chunkSizeBytes: Int = 1204 * 256,
+    bufferSize: Int = 1024 * 64): Observable[ObjectId] =
+    upload(fileName, GridFSStreamObservable(file.newInputStream, bufferSize), metadata, chunkSizeBytes)
+
   def download(oid: ObjectId): GridFSDownloadObservable =
     gridfsBucket.downloadToObservable(oid)
 
-  def downloadToStream(oid: ObjectId, outputStream: OutputStream): GridFSStreamObserver = {
+  def download(id: ObjectId, file: File): GridFSStreamObserver =
+    download(id, file.newOutputStream)
+
+  def download(oid: ObjectId, outputStream: OutputStream): GridFSStreamObserver = {
     val observable: GridFSDownloadObservable = gridfsBucket.downloadToObservable(oid)
     val observer = GridFSStreamObserver(outputStream)
     observable.subscribe(observer)