Initial Mongo Java Server Support

Author: sfxcode

CHANGES.md

@@ -2,6 +2,9 @@
 
 ## Versions
 
+### 2.0.1
+* Mongo Java Server Support
+
 ### 2.0.0
 * mongo package no longer extends MongoImplcits => Use MongoImplcits trait if needed
 

build.sbt

@@ -59,6 +59,8 @@ libraryDependencies += "org.xerial.snappy" % "snappy-java" % "1.1.7.3" % Provide
 
 libraryDependencies += "com.github.luben" % "zstd-jni" % "1.4.4-9" % Provided
 
+libraryDependencies += "de.bwaldvogel" % "mongo-java-server" % "1.28.0" % Provided
+
 libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "4.0.2"
 
 libraryDependencies += "com.github.pathikrit" %% "better-files" % "3.8.0"

src/main/scala/com/sfxcode/nosql/mongo/operation/Search.scala

@@ -38,7 +38,7 @@ abstract class Search[A]()(implicit ct: ClassTag[A]) extends Base[A] {
   def distinctResult[S <: Any](fieldName: String, filter: Bson = Document()): Seq[S] =
     distinct(fieldName, filter).resultList().map(v => fromBson(v).asInstanceOf[S])
 
-  def findAggregated(aggregator: Seq[Bson], allowDiskUse: Boolean = false): AggregateObservable[A] =
-    coll.aggregate(aggregator).allowDiskUse(allowDiskUse)
+  def findAggregated(pipeline: Seq[Bson], allowDiskUse: Boolean = false): AggregateObservable[A] =
+    coll.aggregate(pipeline).allowDiskUse(allowDiskUse)
 
 }

src/main/scala/com/sfxcode/nosql/mongo/server/LocalServer.scala

@@ -0,0 +1,15 @@
+package com.sfxcode.nosql.mongo.server
+
+import de.bwaldvogel.mongo.MongoServer
+import de.bwaldvogel.mongo.backend.memory.MemoryBackend
+
+case class LocalServer(serverConfig: ServerConfig = ServerConfig()) {
+  private val server = new MongoServer(new MemoryBackend())
+
+  server.bind(serverConfig.host, serverConfig.port)
+
+  def name: String = serverConfig.name
+
+  def shutdown(): Unit = server.shutdown()
+
+}

src/main/scala/com/sfxcode/nosql/mongo/server/ServerConfig.scala

@@ -0,0 +1,10 @@
+package com.sfxcode.nosql.mongo.server
+
+import ServerConfig._
+
+case class ServerConfig(name: String = "MongoLocal", host: String = DefaultHost, port: Int = DefaultPort)
+
+object ServerConfig {
+  val DefaultHost = "localhost"
+  val DefaultPort = 28018
+}

src/test/resources/application.conf

@@ -12,6 +12,18 @@ unit.test.mongo {
   compressors = ["snappy"]
 }
 
+unit.test.mongo.local {
+  database = "simple-mongo-unit-test"
+  host = "localhost"
+  port = 28018
+  applicationName = "simple-mongo-config-test"
+  pool {
+    minSize = 5
+    maxSize = 10
+  }
+  compressors = ["snappy"]
+}
+
 config.test.mongo {
   database = "simple-mongo-unit-test"
   host = "localhost"

src/test/scala/com/sfxcode/nosql/mongo/dao/BookDAOSpec.scala

@@ -42,9 +42,9 @@ class BookDAOSpec extends Specification with BeforeAll {
       val dateFilter     = dateInRangeFilter("publishedDate", From, new Date())
 
       val filterStage = filter(and(categoryFilter, dateFilter))
-      val aggregator  = List(filterStage, projectStage)
+      val pipeline    = List(filterStage, projectStage)
 
-      val list = BookDAO.Raw.findAggregated(aggregator).resultList()
+      val list = BookDAO.Raw.findAggregated(pipeline).resultList()
       list must haveSize(8)
     }
 
@@ -53,9 +53,9 @@ class BookDAOSpec extends Specification with BeforeAll {
       val groupStage: Bson =
         group("$categories", Field.sumField("pageCount"), Field.minField("pageCount"), Field.maxField("pageCount"))
 
-      val aggregator = List(groupStage)
+      val pipeline = List(groupStage)
 
-      val list = BookDAO.Raw.findAggregated(aggregator).resultList().map(doc => doc.asPlainMap)
+      val list = BookDAO.Raw.findAggregated(pipeline).resultList().map(doc => doc.asPlainMap)
       list must haveSize(58)
     }
   }

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

@@ -25,19 +25,19 @@ class AggregationSpec extends PersonSpecification {
 
     "support aggregation filter" in {
 
-      val aggregator = List(filterStage, sortStage)
+      val pipeline = List(filterStage, sortStage)
 
-      val aggregated = PersonDAO.findAggregated(aggregator).resultList()
+      val aggregated = PersonDAO.findAggregated(pipeline).resultList()
 
       aggregated.size must be equalTo 98
 
     }
 
     "support aggregation filter and group" in {
       // #agg_execute
-      val aggregator = List(filterStage, groupStage, sortStage)
+      val pipeline = List(filterStage, groupStage, sortStage)
 
-      val aggregated = PersonDAO.Raw.findAggregated(aggregator).resultList()
+      val aggregated = PersonDAO.Raw.findAggregated(pipeline).resultList()
 
       // #agg_execute
 

src/test/scala/com/sfxcode/nosql/mongo/server/LocalServerSpec.scala

@@ -0,0 +1,3 @@
+package com.sfxcode.nosql.mongo.server
+
+class LocalServerSpec {}

src/test/scala/com/sfxcode/nosql/mongo/test/UniversityDatabase.scala

@@ -2,20 +2,22 @@ package com.sfxcode.nosql.mongo.test
 
 import com.sfxcode.nosql.mongo.database.DatabaseProvider
 import com.sfxcode.nosql.mongo.model._
+import com.sfxcode.nosql.mongo.server.LocalServer
 import com.sfxcode.nosql.mongo.{GridFSDAO, MongoDAO}
 import org.bson.codecs.configuration.CodecRegistries.{fromProviders, fromRegistries}
 import org.bson.codecs.configuration.CodecRegistry
 import org.mongodb.scala.bson.codecs.Macros._
 
 object UniversityDatabase {
+  val LocalTestServer = LocalServer()
 
   // create codecs for custom classes
   private val universityRegistry: CodecRegistry = fromProviders(classOf[Student], classOf[Score], classOf[Grade])
 
   private val registry: CodecRegistry = fromRegistries(universityRegistry)
 
   // create provider
-  val provider: DatabaseProvider = DatabaseProvider.fromPath(configPath = "unit.test.mongo", registry = registry)
+  val provider: DatabaseProvider = DatabaseProvider.fromPath(configPath = "unit.test.mongo.local", registry = registry)
 
   // setup DAO objects with mongo collection names