Merge pull request #51 from hmrc/honor-mongo-connection-options

[PLATOPS-328] pass mongoOptions into ReactiveMongoHelper

project/HmrcBuild.scala

@@ -40,7 +40,7 @@ object HmrcBuild extends Build {
 object Dependencies {
 
   object Compile {
-    val reactiveMongoJson = "uk.gov.hmrc" %% "reactivemongo-json" % "2.2.1"
+    val reactiveMongoJson = "uk.gov.hmrc" %% "reactivemongo-json" % "2.3.0"
     //NOTE: 0.11.6 Netty 3.10.4.Final clashes with Play (2.3.10) version of Netty 3.9.8
     val reactiveMongo = "org.reactivemongo" %% "reactivemongo" % "0.11.5"
     val playJson = "com.typesafe.play" %% "play-json" % "2.3.10" % "provided"

src/main/scala/uk/gov/hmrc/mongo/SimpleMongoConnection.scala

@@ -19,11 +19,9 @@ trait SimpleMongoConnection {
 
   private def connect = helper.db
 
-  val channelsPerNode: Option[Int]
-
   lazy val helper = MongoConnection.parseURI(mongoConnectionUri) match {
     case Success(MongoConnection.ParsedURI(hosts, options, ignoreOptions, Some(db), auth)) =>
-      ReactiveMongoHelper(db, hosts.map(h => h._1 + ":" + h._2).toList, auth.toList, channelsPerNode, failoverStrategy)
+      ReactiveMongoHelper(db, hosts.map(h => h._1 + ":" + h._2), auth.toList, failoverStrategy, options)
     case Success(MongoConnection.ParsedURI(_, _, _, None, _)) =>
       throw new Exception(s"Missing database name in mongodb.uri '$mongoConnectionUri'")
     case Failure(e) => throw new Exception(s"Invalid mongodb.uri '$mongoConnectionUri'", e)
@@ -36,4 +34,4 @@ trait SimpleMongoConnection {
 
 }
 
-case class MongoConnector(val mongoConnectionUri: String, channelsPerNode: Option[Int] = None, failoverStrategy : Option[FailoverStrategy] = None) extends SimpleMongoConnection
+case class MongoConnector(mongoConnectionUri: String, failoverStrategy : Option[FailoverStrategy] = None) extends SimpleMongoConnection

src/test/scala/uk/gov/hmrc/mongo/MongoConnectorSpec.scala

@@ -0,0 +1,19 @@
+package uk.gov.hmrc.mongo
+
+import org.scalatest.{Matchers, WordSpec}
+
+/**
+  *
+  * https://docs.mongodb.org/manual/reference/connection-string/#connections-connection-options
+  */
+class MongoConnectorSpec extends WordSpec with Matchers {
+
+  "MongoConnector" should {
+    "create a Mongo connection with the given options" in {
+
+      val connector = MongoConnector("mongodb://mongo-host:2000/mongo?connectTimeoutMS=1000&socketTimeoutMS=2000", failoverStrategy = None)
+
+      connector.db().connection.options.connectTimeoutMS shouldBe 1000
+    }
+  }
+}