Fixed MongoClientSettings builder CodecRegistry

Ensures that the Scala default codec registry is used, unless
the user explictly uses a custom one

SCALA-220

Author: rozza

bson/src/main/scala/org/mongodb/scala/bson/codecs/package.scala

@@ -18,7 +18,6 @@ package org.mongodb.scala.bson
 
 import org.bson.codecs.configuration.CodecRegistries._
 import org.bson.codecs.configuration.CodecRegistry
-import org.bson.codecs.{DocumentCodecProvider => ADocumentCodecProvider}
 import com.mongodb.async.client.MongoClients
 
 package object codecs {

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

@@ -20,13 +20,11 @@ import java.io.Closeable
 
 import scala.reflect.ClassTag
 
-import org.bson.codecs.configuration.CodecRegistries.{ fromProviders, fromRegistries }
 import org.bson.codecs.configuration.CodecRegistry
 import com.mongodb.ConnectionString
 import com.mongodb.async.client.{ MongoClient => JMongoClient, MongoClients }
 
 import org.mongodb.scala.bson.DefaultHelper.DefaultsTo
-import org.mongodb.scala.bson.codecs.DocumentCodecProvider
 import org.mongodb.scala.connection.{ ClusterSettings, ConnectionPoolSettings, ServerSettings, SocketSettings, SslSettings }
 import org.mongodb.scala.internal.ObservableHelper.observe
 
@@ -70,10 +68,7 @@ object MongoClient {
    */
   def apply(clientSettings: MongoClientSettings): MongoClient = MongoClient(MongoClients.create(clientSettings))
 
-  val DEFAULT_CODEC_REGISTRY: CodecRegistry = fromRegistries(
-    MongoClients.getDefaultCodecRegistry,
-    fromProviders(DocumentCodecProvider())
-  )
+  val DEFAULT_CODEC_REGISTRY: CodecRegistry = org.mongodb.scala.bson.codecs.DEFAULT_CODEC_REGISTRY
 }
 
 /**

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

@@ -16,7 +16,7 @@
 
 package org.mongodb.scala
 
-import com.mongodb.async.client.{ MongoClientSettings => JMongoClientSettings }
+import com.mongodb.async.client.{ MongoClientSettings => JMongoClientSettings, MongoClients => JMongoClients }
 
 /**
  * A MongoClientSettings companion object
@@ -29,13 +29,20 @@ object MongoClientSettings {
    * Creates a the default builder
    * @return a MongoClientSettings builder
    */
-  def builder(): JMongoClientSettings.Builder = JMongoClientSettings.builder()
+  def builder(): JMongoClientSettings.Builder = JMongoClientSettings.builder().codecRegistry(MongoClient.DEFAULT_CODEC_REGISTRY)
 
   /**
    * Creates a builder from an existing `MongoClientSettings`.
    *
    * @param settings the settings to create the builder from
    * @return a MongoClientSettings builder
    */
-  def builder(settings: MongoClientSettings): JMongoClientSettings.Builder = JMongoClientSettings.builder(settings)
+  def builder(settings: MongoClientSettings): JMongoClientSettings.Builder = {
+    val builder = JMongoClientSettings.builder(settings)
+    if (settings.getCodecRegistry == JMongoClients.getDefaultCodecRegistry) {
+      builder.codecRegistry(MongoClient.DEFAULT_CODEC_REGISTRY)
+    }
+    builder
+  }
+
 }

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.mongodb.scala
+
+import org.bson.codecs.configuration.CodecRegistries._
+
+import org.mongodb.scala.bson.codecs.{ DEFAULT_CODEC_REGISTRY, DocumentCodecProvider }
+import org.scalamock.scalatest.proxy.MockFactory
+import org.scalatest.{ FlatSpec, Matchers }
+
+class MongoClientSettingsSpec extends FlatSpec with Matchers with MockFactory {
+
+  "MongoClientSettings" should "default with the Scala Codec Registry" in {
+    MongoClientSettings.builder().build().getCodecRegistry should equal(DEFAULT_CODEC_REGISTRY)
+  }
+
+  it should "keep the default Scala Codec Registry in no codec registry is set" in {
+    val settings = MongoClientSettings.builder().readPreference(ReadPreference.nearest()).build()
+    MongoClientSettings.builder(settings).build().getCodecRegistry should equal(DEFAULT_CODEC_REGISTRY)
+  }
+
+  it should "use a none default Codec Registry if set" in {
+    val codecRegistry = fromProviders(DocumentCodecProvider())
+    val settings = MongoClientSettings.builder().codecRegistry(codecRegistry).build()
+    MongoClientSettings.builder(settings).build().getCodecRegistry should equal(codecRegistry)
+  }
+
+}

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

@@ -15,6 +15,7 @@
  */
 
 package org.mongodb.scala
+
 import scala.collection.JavaConverters._
 
 import org.bson.BsonDocument
@@ -46,7 +47,7 @@ class MongoClientSpec extends FlatSpec with Matchers with MockFactory {
     mongoClient.settings.getClusterSettings.getHosts().asScala.head shouldBe serverAddress
   }
 
-  it should "accept MongoClientOptions" in {
+  it should "accept MongoClientSettings" in {
     val serverAddress = new ServerAddress("localhost", 27020)
     val clusterSettings = ClusterSettings.builder().hosts(List(serverAddress).asJava).build()
     val mongoClient = MongoClient(MongoClientSettings.builder().clusterSettings(clusterSettings).build())

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

@@ -15,6 +15,7 @@
  */
 
 package org.mongodb.scala
+
 import scala.collection.JavaConverters._
 
 import org.bson.BsonDocument