Updated Mongodb Driver Async dependency to 3.5.0

Author: rozza

bson/src/main/scala/org/mongodb/scala/bson/codecs/macrocodecs/MacroCodec.scala

@@ -21,7 +21,7 @@ import scala.collection.mutable
 
 import org.bson.codecs.configuration.{ CodecConfigurationException, CodecRegistries, CodecRegistry }
 import org.bson.codecs.{ Codec, DecoderContext, Encoder, EncoderContext }
-import org.bson.{ BsonReader, BsonType, BsonValue, BsonWriter }
+import org.bson._
 
 import org.mongodb.scala.bson.BsonNull
 
@@ -124,10 +124,10 @@ trait MacroCodec[T] extends Codec[T] {
         }
       }
 
-      reader.mark()
+      val mark: BsonReaderMark = reader.getMark()
       reader.readStartDocument()
       val optionalClassName: Option[String] = readOptionalClassName()
-      reader.reset()
+      mark.reset()
 
       val className = optionalClassName.getOrElse {
         throw new CodecConfigurationException(s"Could not decode sealed case class. Missing '$classFieldName' field.")

docs/reference/content/changelog.md

@@ -11,7 +11,8 @@ title = "Changelog"
 Changes between released versions
 
 ### 2.2.0
-
+  
+  * Updated Mongodb Driver Async dependency to [3.5.0](https://jira.mongodb.org/browse/SCALA-335)
   * CaseClassCodec - Added support for internal vals. [SCALA-314](https://jira.mongodb.org/browse/SCALA-314)
   * CaseClassCodec - Added support for default values. [SCALA-313](https://jira.mongodb.org/browse/SCALA-313)
   * CaseClassCodec - Added handling of extra values in the document. [SCALA-307](https://jira.mongodb.org/browse/SCALA-307)

driver/src/it/scala/org/mongodb/scala/RequiresMongoDBISpec.scala

@@ -121,7 +121,7 @@ trait RequiresMongoDBISpec extends FlatSpec with Matchers with ScalaFutures with
   def serverVersionAtLeast(minServerVersion: List[Int]): Boolean = {
     buildInfo.get[BsonString]("version") match {
       case Some(version) =>
-        val serverVersion = version.getValue.split("\\.").map(_.toInt).padTo(3, 0).take(3).toList.asJava
+        val serverVersion = version.getValue.split("\\D+").map(_.toInt).padTo(3, 0).take(3).toList.asJava
         new ServerVersion(serverVersion.asInstanceOf[java.util.List[Integer]]).compareTo(
           new ServerVersion(minServerVersion.asJava.asInstanceOf[java.util.List[Integer]])) > 0
       case None => false
@@ -131,7 +131,7 @@ trait RequiresMongoDBISpec extends FlatSpec with Matchers with ScalaFutures with
   def serverVersionLessThan(maxServerVersion: List[Int]): Boolean = {
     buildInfo.get[BsonString]("version") match {
       case Some(version) =>
-        val serverVersion = version.getValue.split("\\.").map(_.toInt).padTo(3, 0).take(3).toList.asJava
+        val serverVersion = version.getValue.split("\\D+").map(_.toInt).padTo(3, 0).take(3).toList.asJava
         new ServerVersion(serverVersion.asInstanceOf[java.util.List[Integer]]).compareTo(
           new ServerVersion(maxServerVersion.asJava.asInstanceOf[java.util.List[Integer]])) < 0
       case None => false

driver/src/main/scala/org/mongodb/scala/AggregateObservable.scala

@@ -64,9 +64,14 @@ case class AggregateObservable[TResult](private val wrapped: AggregateIterable[T
    * Sets whether the server should use a cursor to return results.
    *
    * [[http://docs.mongodb.org/manual/reference/command/aggregate/ Aggregation]]
+   *
    * @param useCursor whether the server should use a cursor to return results
    * @return this
+   * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+   *             that support it (>= 2.6). The driver will ignore this as of MongoDB 3.6, which does not support inline results for
+   *             the aggregate command.
    */
+  @Deprecated
   def useCursor(useCursor: Boolean): AggregateObservable[TResult] = {
     wrapped.useCursor(useCursor)
     this

driver/src/main/scala/org/mongodb/scala/FindObservable.scala

@@ -119,9 +119,12 @@ case class FindObservable[TResult](private val wrapped: FindIterable[TResult]) e
    * Sets the query modifiers to apply to this operation.
    *
    * [[http://docs.mongodb.org/manual/reference/operator/query-modifier/ Query Modifiers]]
+   *
    * @param modifiers the query modifiers to apply, which may be null.
    * @return this
+   * @deprecated use the individual setters instead
    */
+  @Deprecated
   def modifiers(modifiers: Bson): FindObservable[TResult] = {
     wrapped.modifiers(modifiers)
     this
@@ -210,5 +213,105 @@ case class FindObservable[TResult](private val wrapped: FindIterable[TResult]) e
     this
   }
 
+  /**
+   * Sets the comment to the query. A null value means no comment is set.
+   *
+   * @param comment the comment
+   * @return this
+   * @since 2.2
+   */
+  def comment(comment: String): FindObservable[TResult] = {
+    wrapped.comment(comment)
+    this
+  }
+
+  /**
+   * Sets the hint for which index to use. A null value means no hint is set.
+   *
+   * @param hint the hint
+   * @return this
+   * @since 2.2
+   */
+  def hint(hint: Bson): FindObservable[TResult] = {
+    wrapped.hint(hint)
+    this
+  }
+
+  /**
+   * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+   *
+   * @param max the max
+   * @return this
+   * @since 2.2
+   */
+  def max(max: Bson): FindObservable[TResult] = {
+    wrapped.max(max)
+    this
+  }
+
+  /**
+   * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+   *
+   * @param min the min
+   * @return this
+   * @since 2.2
+   */
+  def min(min: Bson): FindObservable[TResult] = {
+    wrapped.min(min)
+    this
+  }
+
+  /**
+   * Sets the maximum number of documents or index keys to scan when executing the query.
+   *
+   * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+   *
+   * @param maxScan the maxScan
+   * @return this
+   * @since 2.2
+   */
+  def maxScan(maxScan: Long): FindObservable[TResult] = {
+    wrapped.maxScan(maxScan)
+    this
+  }
+
+  /**
+   * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+   *
+   * @param returnKey the returnKey
+   * @return this
+   * @since 2.2
+   */
+  def returnKey(returnKey: Boolean): FindObservable[TResult] = {
+    wrapped.returnKey(returnKey)
+    this
+  }
+
+  /**
+   * Sets the showRecordId. Set to true to add a field `$recordId` to the returned documents.
+   *
+   * @param showRecordId the showRecordId
+   * @return this
+   * @since 2.2
+   */
+  def showRecordId(showRecordId: Boolean): FindObservable[TResult] = {
+    wrapped.showRecordId(showRecordId)
+    this
+  }
+
+  /**
+   * Sets the snapshot.
+   *
+   * If true it prevents the cursor from returning a document more than once because of an intervening write operation.
+   *
+   * @param snapshot the snapshot
+   * @return this
+   * @since 2.2
+   */
+  def snapshot(snapshot: Boolean): FindObservable[TResult] = {
+    wrapped.snapshot(snapshot)
+    this
+  }
+
   override def subscribe(observer: Observer[_ >: TResult]): Unit = observe(wrapped).subscribe(observer)
 }

driver/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala

@@ -34,7 +34,8 @@ class ApiAliasAndCompanionSpec extends FlatSpec with Matchers {
   "The scala package" should "mirror the com.mongodb package and com.mongodb.async.client" in {
     val packageName = "com.mongodb"
     val javaExclusions = Set("AsyncBatchCursor", "Block", "ConnectionString", "Function", "ServerCursor", "Majority", "MongoClients",
-      "MongoIterable", "Observables", "SingleResultCallback", "GridFSBuckets")
+      "MongoIterable", "Observables", "SingleResultCallback", "GridFSBuckets", "DBRefCodec", "DBRefCodecProvider", "DBRef",
+      "DocumentToDBRefTransformer")
     val scalaExclusions = Set("package", "internal", "result", "Helpers", "Document", "BulkWriteResult", "ScalaObservable",
       "ScalaWriteConcern", "ObservableImplicits", "Completed", "BoxedObservable", "BoxedObserver", "BoxedSubscription",
       "classTagToClassOf", "ReadConcernLevel", "bsonDocumentToDocument", "bsonDocumentToUntypedDocument", "documentToUntypedDocument",

driver/src/test/scala/org/mongodb/scala/model/FiltersSpec.scala

@@ -189,9 +189,9 @@ class FiltersSpec extends FlatSpec with Matchers {
   }
 
   it should "render $regex" in {
-    toBson(model.Filters.regex("name", "acme.*corp")) should equal(Document("""{name : {$regex : "acme.*corp"}}"""))
+    toBson(model.Filters.regex("name", "acme.*corp")) should equal(Document("""{name : {$regex : "acme.*corp", $options : ""}}"""))
     toBson(model.Filters.regex("name", "acme.*corp", "si")) should equal(Document("""{name : {$regex : "acme.*corp", $options : "si"}}"""))
-    toBson(model.Filters.regex("name", "acme.*corp".r)) should equal(Document("""{name : {$regex : "acme.*corp"}}"""))
+    toBson(model.Filters.regex("name", "acme.*corp".r)) should equal(Document("""{name : {$regex : "acme.*corp", $options : ""}}"""))
   }
 
   it should "render $where" in {

project/Dependencies.scala

@@ -21,7 +21,7 @@ object Dependencies {
   // Versions
   val scalaVersions           = Seq("2.11.11", "2.12.2")
   val scalaCoreVersion        = "2.12.2"
-  val mongodbDriverVersion    = "3.4.2"
+  val mongodbDriverVersion    = "3.5.0"
 
   val scalaTestVersion        = "3.0.1"
   val scalaMockVersion        = "3.4.1"

project/MongoScalaBuild.scala

@@ -52,7 +52,7 @@ object MongoScalaBuild extends Build {
   def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
     Seq( "-unchecked", "-deprecation", "-feature", "-Ywarn-dead-code"
       /*,"-Xfatal-warnings", "-Ymacro-debug-verbose", "-Xlog-implicits", "-Yinfer-debug", "-Xprint:typer"*/) ++ (scalaVersion match {
-      case "2.12.2" => Seq("-Xlint:-unused,-missing-interpolator,_", "-Ywarn-unused:imports,privates,locals,-implicits,-params")
+      case "2.12.2" => Seq("-Xlint:-unused,-missing-interpolator,_" /*, "-Ywarn-unused:imports,privates,locals,-implicits,-params"*/)
       case _ => Seq("-language:existentials", "-Xlint:-missing-interpolator,_")
     })
   }