new Version

sfxcode · sfxcode · commit d3aba1c68d66 · 2018-11-13T21:34:41.000+01:00
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/Converter.scala b/src/main/scala/com/sfxcode/nosql/mongo/Converter.scala
@@ -4,8 +4,8 @@ import com.sfxcode.nosql.mongo.bson.BsonConverter
 import org.mongodb.scala.Document
 
 /**
-  * Created by tom on 20.01.17.
-  */
+ * Created by tom on 20.01.17.
+ */
 object Converter {
 
   def toDocument(value: Any): Document =
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/MongoDAO.scala b/src/main/scala/com/sfxcode/nosql/mongo/MongoDAO.scala
@@ -6,8 +6,8 @@ import org.mongodb.scala.{ Document, MongoCollection, MongoDatabase }
 import scala.reflect.ClassTag
 
 /**
-  * Created by tom on 20.01.17.
-  */
+ * Created by tom on 20.01.17.
+ */
 abstract class MongoDAO[A](database: MongoDatabase, collectionName: String)(implicit ct: ClassTag[A]) extends Crud[A] {
 
   val collection: MongoCollection[A] = database.getCollection[A](collectionName)
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/bson/BsonConverter.scala b/src/main/scala/com/sfxcode/nosql/mongo/bson/BsonConverter.scala
@@ -26,26 +26,26 @@ object BsonConverter {
         }
       case v: Any if converterPlugin.hasCustomClass(v) =>
         converterPlugin.toBson(v)
-      case b: Boolean         => BsonBoolean(b)
-      case s: String          => BsonString(s)
-      case c: Char            => BsonString(c.toString)
+      case b: Boolean => BsonBoolean(b)
+      case s: String => BsonString(s)
+      case c: Char => BsonString(c.toString)
       case bytes: Array[Byte] => BsonBinary(bytes)
-      case r: Regex           => BsonRegularExpression(r)
-      case d: Date            => BsonDateTime(d)
+      case r: Regex => BsonRegularExpression(r)
+      case d: Date => BsonDateTime(d)
       case ld: LocalDate =>
         BsonDateTime(Date.from(ld.atStartOfDay(ZoneId.systemDefault()).toInstant))
       case ldt: LocalDateTime =>
         BsonDateTime(Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant))
-      case oid: ObjectId            => BsonObjectId(oid)
-      case i: Int                   => BsonInt32(i)
-      case l: Long                  => BsonInt64(l)
-      case bi: BigInt               => BsonInt64(bi.longValue())
-      case bi: BigInteger           => BsonInt64(bi.longValue())
-      case d: Double                => BsonDouble(d)
-      case f: Float                 => BsonDouble(f)
-      case bd: BigDecimal           => BsonDecimal128.apply(bd)
+      case oid: ObjectId => BsonObjectId(oid)
+      case i: Int => BsonInt32(i)
+      case l: Long => BsonInt64(l)
+      case bi: BigInt => BsonInt64(bi.longValue())
+      case bi: BigInteger => BsonInt64(bi.longValue())
+      case d: Double => BsonDouble(d)
+      case f: Float => BsonDouble(f)
+      case bd: BigDecimal => BsonDecimal128.apply(bd)
       case bd: java.math.BigDecimal => BsonDecimal128.apply(bd)
-      case doc: Document            => BsonDocument(doc)
+      case doc: Document => BsonDocument(doc)
       case map: Map[_, _] =>
         var doc = Document()
         map.keys.foreach(key => {
@@ -75,22 +75,22 @@ object BsonConverter {
   def fromBson(value: BsonValue): Any =
     value match {
 
-      case b: BsonBoolean           => b.getValue
-      case s: BsonString            => s.getValue
-      case bytes: BsonBinary        => bytes.getData
+      case b: BsonBoolean => b.getValue
+      case s: BsonString => s.getValue
+      case bytes: BsonBinary => bytes.getData
       case r: BsonRegularExpression => r.getPattern
-      case d: BsonDateTime          => new Date(d.getValue)
-      case d: BsonTimestamp         => new Date(d.getTime)
-      case oid: BsonObjectId        => oid.getValue
-      case i: BsonInt32             => i.getValue
-      case l: BsonInt64             => l.getValue
-      case d: BsonDouble            => d.doubleValue()
-      case d: BsonDecimal128        => d.getValue.bigDecimalValue()
-      case doc: BsonDocument        => Document(doc)
+      case d: BsonDateTime => new Date(d.getValue)
+      case d: BsonTimestamp => new Date(d.getTime)
+      case oid: BsonObjectId => oid.getValue
+      case i: BsonInt32 => i.getValue
+      case l: BsonInt64 => l.getValue
+      case d: BsonDouble => d.doubleValue()
+      case d: BsonDecimal128 => d.getValue.bigDecimalValue()
+      case doc: BsonDocument => Document(doc)
       case array: BsonArray =>
         array.getValues.asScala.toList.map(v => fromBson(v))
       case n: BsonNull => null
-      case _           => value
+      case _ => value
     }
 
   def asMap(document: Document): Map[String, Any] = {
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/BigDecimalCodec.scala b/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/BigDecimalCodec.scala
@@ -4,9 +4,9 @@ import org.bson.codecs.{ Codec, DecoderContext, EncoderContext }
 import org.bson.{ BsonReader, BsonWriter }
 
 /**
-  * A Codec for BigDecimal instances.
-  *
-  */
+ * A Codec for BigDecimal instances.
+ *
+ */
 class BigDecimalCodec extends Codec[BigDecimal] {
 
   override def decode(reader: BsonReader, decoderContext: DecoderContext): BigDecimal =
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/BigIntCodec.scala b/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/BigIntCodec.scala
@@ -4,10 +4,10 @@ import org.bson.codecs.{ Codec, DecoderContext, EncoderContext }
 import org.bson.{ BsonReader, BsonWriter }
 
 /**
-  * A Codec for BigInt instances.
-  *
-  * @since 3.0
-  */
+ * A Codec for BigInt instances.
+ *
+ * @since 3.0
+ */
 class BigIntCodec extends Codec[BigInt] {
 
   override def decode(reader: BsonReader, decoderContext: DecoderContext): BigInt =
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/CustomCodecProvider.scala b/src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/CustomCodecProvider.scala
@@ -5,16 +5,16 @@ import org.bson.codecs.configuration.{ CodecProvider, CodecRegistry }
 
 case class CustomCodecProvider() extends CodecProvider {
 
-  val BigIntClass     = classOf[BigInt]
+  val BigIntClass = classOf[BigInt]
   val BigDecimalClass = classOf[BigDecimal]
 
   // scalastyle:off null
   @SuppressWarnings(Array("unchecked"))
   def get[T](clazz: Class[T], registry: CodecRegistry): Codec[T] =
     clazz match {
-      case BigIntClass     => new BigIntCodec().asInstanceOf[Codec[T]]
+      case BigIntClass => new BigIntCodec().asInstanceOf[Codec[T]]
       case BigDecimalClass => new BigDecimalCodec().asInstanceOf[Codec[T]]
-      case _               => null
+      case _ => null
     }
   // scalastyle:on null
 }
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Base.scala b/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Base.scala
@@ -22,10 +22,9 @@ abstract class Base extends LazyLogging {
   }
 
   def downloadToStream(
-      oid: ObjectId,
-      outputPath: Path,
-      openOptions: Seq[OpenOption] = List(StandardOpenOption.CREATE, StandardOpenOption.WRITE)
-  ): Observable[Long] = {
+    oid: ObjectId,
+    outputPath: Path,
+    openOptions: Seq[OpenOption] = List(StandardOpenOption.CREATE, StandardOpenOption.WRITE)): Observable[Long] = {
     val streamToDownloadTo: AsynchronousFileChannel =
       AsynchronousFileChannel.open(outputPath, openOptions: _*)
     gridfsBucket.downloadToStream(oid, channelToOutputStream(streamToDownloadTo))
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Crud.scala b/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Crud.scala
@@ -13,15 +13,16 @@ abstract class Crud extends Search {
 
   def deleteOne(id: ObjectId): Observable[Completed] = gridfsBucket.delete(id)
 
-  def insertOne(fileName: String,
-                stream: InputStream,
-                metadata: AnyRef = Document(),
-                chunkSizeBytes: Int = chunkSizeBytes): Observable[ObjectId] = {
+  def insertOne(
+    fileName: String,
+    stream: InputStream,
+    metadata: AnyRef = Document(),
+    chunkSizeBytes: Int = chunkSizeBytes): Observable[ObjectId] = {
     val streamToUploadFrom: AsyncInputStream = toAsyncInputStream(stream)
     val metadataDocument = {
       metadata match {
         case document: Document => document
-        case _                  => Converter.toDocument(metadata)
+        case _ => Converter.toDocument(metadata)
       }
     }
     val options: GridFSUploadOptions = new GridFSUploadOptions()
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Metadata.scala b/src/main/scala/com/sfxcode/nosql/mongo/gridfs/Metadata.scala
@@ -16,7 +16,7 @@ abstract class Metadata(database: MongoDatabase, bucketName: String) extends Cru
 
   def updateMetadata(oid: ObjectId, value: Any): Observable[UpdateResult] = {
     val doc: BsonValue = BsonConverter.toBson(value)
-    val result         = Files.updateOne(equal("_id", oid), set("metadata", doc))
+    val result = Files.updateOne(equal("_id", oid), set("metadata", doc))
     result
   }
 
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/operation/Crud.scala b/src/main/scala/com/sfxcode/nosql/mongo/operation/Crud.scala
@@ -27,13 +27,13 @@ abstract class Crud[A]()(implicit ct: ClassTag[A]) extends Search[A] {
 
   def replaceOne(value: A): Observable[UpdateResult] = {
     val document = Converter.toDocument(value)
-    val oid      = document.get("_id").get
+    val oid = document.get("_id").get
     coll.replaceOne(equal("_id", oid), value)
   }
 
   def replaceOne(value: A, options: ReplaceOptions): Observable[UpdateResult] = {
     val document = Converter.toDocument(value)
-    val oid      = document.get("_id").get
+    val oid = document.get("_id").get
     coll.replaceOne(equal("_id", oid), value, options)
   }
 
diff --git a/src/main/scala/com/sfxcode/nosql/mongo/operation/CrudObserver.scala b/src/main/scala/com/sfxcode/nosql/mongo/operation/CrudObserver.scala
@@ -19,7 +19,7 @@ trait CrudObserver[A] extends Crud[A] {
     replaceOne(value).subscribe(observer)
 
   def deleteValue(value: A, observer: Observer[DeleteResult] = new SimpleCompletedObserver[DeleteResult]): Unit = {
-    val oid    = Converter.toDocument(value).get("_id").get
+    val oid = Converter.toDocument(value).get("_id").get
     val filter = equal("_id", oid)
     deleteOne(filter)
   }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ abstract class Metadata(database: MongoDatabase, bucketName: String) extends Cru`
`16`	`16`
`17`	`17`	`def updateMetadata(oid: ObjectId, value: Any): Observable[UpdateResult] = {`
`18`	`18`	`val doc: BsonValue = BsonConverter.toBson(value)`
`19`		`- val result = Files.updateOne(equal("_id", oid), set("metadata", doc))`
	`19`	`+ val result = Files.updateOne(equal("_id", oid), set("metadata", doc))`
`20`	`20`	`result`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ abstract class Crud[A]()(implicit ct: ClassTag[A]) extends Search[A] {`
`27`	`27`
`28`	`28`	`def replaceOne(value: A): Observable[UpdateResult] = {`
`29`	`29`	`val document = Converter.toDocument(value)`
`30`		`- val oid = document.get("_id").get`
	`30`	`+ val oid = document.get("_id").get`
`31`	`31`	`coll.replaceOne(equal("_id", oid), value)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`def replaceOne(value: A, options: ReplaceOptions): Observable[UpdateResult] = {`
`35`	`35`	`val document = Converter.toDocument(value)`
`36`		`- val oid = document.get("_id").get`
	`36`	`+ val oid = document.get("_id").get`
`37`	`37`	`coll.replaceOne(equal("_id", oid), value, options)`
`38`	`38`	`}`
`39`	`39`