sbt 1.4.0

Author: sfxcode

build.sbt

@@ -26,10 +26,10 @@ lazy val docs = (project in file("docs"))
   .enablePlugins(GhpagesPlugin)
   .settings(
     name := "simple mongo docs",
-    scalaVersion := "2.13.2",
+    scalaVersion := "2.13.3",
     resolvers += "SFXCode" at "https://dl.bintray.com/sfxcode/maven/",
-    libraryDependencies += "com.sfxcode.nosql" %% "simple-mongo" % "1.9.3",
-    libraryDependencies += "org.xerial.snappy"  % "snappy-java"  % "1.1.7.3",
+    libraryDependencies += "com.sfxcode.nosql" % "simple-mongo_2.13" % "2.0.5",
+    libraryDependencies += "org.xerial.snappy" % "snappy-java"       % "1.1.7.3",
     publish / skip := true,
     ghpagesNoJekyll := true,
     git.remoteRepo := "[email protected]:sfxcode/simple-mongo.git",
@@ -53,15 +53,15 @@ libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % Test
 
 libraryDependencies += "joda-time" % "joda-time" % "2.10.6" % Test
 
-libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.9" % Test
+libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.10" % Test
 
 libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.1.0"
 
 libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.7.7" % Provided
 
 libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.5-6" % Provided
 
-val MongoJavaServerVersion = "1.34.0"
+val MongoJavaServerVersion = "1.36.0"
 
 libraryDependencies += "de.bwaldvogel" % "mongo-java-server" % MongoJavaServerVersion % Provided
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.0-RC1
+sbt.version=1.4.0

src/test/scala/com/sfxcode/nosql/mongo/operation/CrudSpec.scala

@@ -1,12 +1,16 @@
 package com.sfxcode.nosql.mongo.operation
 
-import com.sfxcode.nosql.mongo.test.TestDatabase._
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.dao.PersonSpecification
+import com.sfxcode.nosql.mongo.database.DatabaseProvider
 import com.sfxcode.nosql.mongo.model.CodecTest
+import com.sfxcode.nosql.mongo.test.TestDatabase._
 import com.typesafe.scalalogging.LazyLogging
+import org.bson.conversions.Bson
 import org.mongodb.scala.bson.ObjectId
-import org.mongodb.scala.model.changestream.ChangeStreamDocument
+import org.mongodb.scala.model.Filters.equal
+import org.mongodb.scala.result.DeleteResult
+import org.mongodb.scala.model.Updates._
 
 class CrudSpec extends PersonSpecification with LazyLogging {
 
@@ -15,32 +19,52 @@ class CrudSpec extends PersonSpecification with LazyLogging {
   override def beforeAll(): Unit = {
     super.beforeAll()
     CodecDao.drop().result()
-    // CodecDao.addChangeObserver(ChangeObserver(consumeCodecChanges))
-    val result = CodecDao.insertOne(CodecTest()).result()
 
-    val list: List[CodecTest] = CodecDao.find().resultList()
-    list.size mustEqual 1
+  }
 
-    list.head._id must haveClass[ObjectId]
+  "Crud Operations" should {
 
-    def consumeCodecChanges(changeStreamDocument: ChangeStreamDocument[CodecTest]): Unit =
-      logger.info(
-        "codec changed %s:%s with ID: %s".format(
-          changeStreamDocument.getNamespace,
-          changeStreamDocument.getOperationType,
-          changeStreamDocument.getDocumentKey
-        )
-      )
+    "create Document in" in {
+      val result = CodecDao.insertOne(CodecTest()).result()
 
-  }
+      val list: List[CodecTest] = CodecDao.find().resultList()
+      list.size mustEqual 1
 
-  "Crud Operations" should {
+    }
+
+    "update Document in" in {
+      var list: List[CodecTest] = CodecDao.find().resultList()
+      var codec                 = list.head
+      codec.id mustEqual 1
+      CodecDao.updateOne(Map("id" -> 1), set("id", 2)).result()
+      list = CodecDao.find().resultList()
+      codec = list.head
+      codec.id mustEqual 2
+    }
+
+    "replace Document in" in {
+      var list: List[CodecTest] = CodecDao.find().resultList()
+      var codec                 = list.head
+      codec.id mustEqual 2
+      CodecDao.replaceOne(codec.copy(id = 1)).result()
+      list = CodecDao.find().resultList()
+      codec = list.head
+      codec.id mustEqual 1
+    }
+
+    "delete Document in" in {
+      val hexString = CodecDao.find().result()._id.toHexString
+      hexString must not beEmpty
+
+      val result: DeleteResult =
+        CodecDao.deleteOne(equal(DatabaseProvider.ObjectIdKey, new ObjectId(hexString))).result()
+
+      result.wasAcknowledged() must beTrue
+      result.getDeletedCount must beEqualTo(1)
 
-    "create Documents in" in {
+      val list: List[CodecTest] = CodecDao.find().resultList()
 
-      CodecDao.count().result() must be equalTo 1
-      val findOneResult: Option[CodecTest] = CodecDao.find("id", 1).resultOption()
-      findOneResult must beSome[CodecTest]
+      list.size mustEqual 0
     }
 
   }