Added async support for com.mongodb.MongoClientSettings

Deprecated async.client.MongoClientSettings
Unifies configuration for the async and sync packages

JAVA-2837

Author: rozza

docs/reference/content/driver-async/getting-started/quick-start.md

@@ -134,7 +134,7 @@ The connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc39
 MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost"));
 ```
 
-- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.async.client.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.html">}}) object:
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object:
 
 ```java
 ClusterSettings clusterSettings = ClusterSettings.builder()

docs/reference/content/driver-async/tutorials/compression.md

@@ -55,15 +55,15 @@ In all cases the driver will use the first compressor in the list for which the
 
 ```java
 import com.mongodb.connection.ClusterSettings;
-import com.mongodb.async.client.MongoClientSettings;
 import com.mongodb.async.client.MongoClients;
 import com.mongodb.async.client.MongoClient;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCompressor;
 import java.util.Arrays;
 
 ```
 
-To specify compression with [`MongoClientSettings`]({{<apiref "com/mongodb/async/client/MongoClientSettings">}}), set the `compressors` property 
+To specify compression with [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}), set the `compressors` property
 to a list of `MongoCompressor` instances:
 
 ```java
@@ -107,4 +107,3 @@ As with configuration with a URI, the driver will use the first compressor in th
 As the JDK has no built-in support for Snappy, the driver takes a dependency on an existing open-source Snappy implementation.  See the
 [snappy-java Github repository](https://github.com/xerial/snappy-java) for details.
 
- 

docs/reference/content/driver-async/tutorials/connect-to-mongodb.md

@@ -76,7 +76,7 @@ To connect to a standalone MongoDB instance:
     MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost"));
     ```
 
-- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.async.client.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.html">}}) object. To specify the host information, use the [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information, use the [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
 
     ```java
     ClusterSettings clusterSettings = ClusterSettings.builder()
@@ -88,7 +88,7 @@ To connect to a standalone MongoDB instance:
     ```
 
 {{% note class="tip" %}}
-[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) provide more configuration options than a connection string.
+[`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings" >}}) provide more configuration options than a connection string.
 {{% /note %}}
 
 ## Connect to a Replica Set
@@ -132,7 +132,7 @@ MongoDB will auto-discover the primary and the secondaries.
           new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017/?replicaSet=myReplicaSet"));
       ```
 
-- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.async.client.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.html">}}) object. To specify the host information of the replica set members, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the replica set members, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
 
       ```java
       ClusterSettings clusterSettings = ClusterSettings.builder()
@@ -173,7 +173,7 @@ To connect to a single `mongos` instance:
                 new ConnectionString("mongodb://localhost"));
     ```
 
-- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.async.client.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instance, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instance, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
 
     ```java
     ClusterSettings clusterSettings = ClusterSettings.builder()
@@ -200,7 +200,7 @@ To connect to multiple `mongos` instances, specify the host and port of the `mon
                 new ConnectionString("mongodb://host1:27017,host2:27017"));
     ```
 
-- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.async.client.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instances, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.MongoClientSettings-" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instances, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
 
 
     ```java
@@ -246,7 +246,7 @@ To configure the driver to use Netty,
     MongoClient client = MongoClients.create("mongodb://localhost/?streamType=netty");
     ```
 
-- Configure [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.Builder.html#streamFactoryFactory-com.mongodb.connection.StreamFactoryFactory-">}}) with the `StreamFactory` set to use Netty:
+- Configure [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.Builder.html#streamFactoryFactory-com.mongodb.connection.StreamFactoryFactory-">}}) with the `StreamFactory` set to use Netty:
 
     ```java
     MongoClient client = MongoClients.create(MongoClientSettings.builder()

docs/reference/content/driver-async/tutorials/perform-read-operations.md

@@ -221,7 +221,7 @@ For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded
 
 - In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
 
-  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/async/client/MongoClientSettings.html">}}), as in the following example:
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
 
       ```java
       ClusterSettings clusterSettings = ClusterSettings.builder()
@@ -280,7 +280,7 @@ For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded
 
 - In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
 
-  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/async/client/MongoClientSettings.html">}}), as in the following example:
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
 
       ```java
       ClusterSettings clusterSettings = ClusterSettings.builder()

docs/reference/content/driver-async/tutorials/perform-write-operations.md

@@ -339,7 +339,7 @@ Applications can configure [write concern]({{<docsref "reference/write-concern">
 
 - In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
 
-  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/async/client/MongoClientSettings.html">}}), as in the following example:
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
 
       ```java
       ClusterSettings clusterSettings = ClusterSettings.builder()

docs/reference/content/driver-async/tutorials/ssl.md

@@ -36,7 +36,7 @@ You can also specify the connection string via the [`ConnectionString`]({{< apir
 
 ### Via `MongoClientSettings`
 
-To specify TLS/SSL with  [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.Builder.html#streamFactoryFactory-com.mongodb.connection.StreamFactoryFactory-">}}) , 
+To specify TLS/SSL with  [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.Builder.html#streamFactoryFactory-com.mongodb.connection.StreamFactoryFactory-">}}) ,
 set the ``sslEnabled`` property to ``true``, and the stream factory to 
 [`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}), as in
 

driver-async/src/examples/documentation/DocumentationSamples.java

@@ -19,12 +19,12 @@
 import com.mongodb.Block;
 import com.mongodb.MongoCompressor;
 import com.mongodb.MongoNamespace;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.async.FutureResultCallback;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.client.DatabaseTestCase;
 import com.mongodb.async.client.FindIterable;
 import com.mongodb.async.client.MongoClient;
-import com.mongodb.async.client.MongoClientSettings;
 import com.mongodb.async.client.MongoClients;
 import com.mongodb.async.client.MongoCollection;
 import com.mongodb.client.result.DeleteResult;

driver-async/src/main/com/mongodb/async/client/MongoClient.java

@@ -71,7 +71,9 @@ public interface MongoClient extends Closeable {
      * <p>Note: {@link MongoClientSettings} is immutable.</p>
      *
      * @return the settings
+     * @deprecated this method is being removed
      */
+    @Deprecated
     MongoClientSettings getSettings();
 
     /**

driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java

@@ -37,6 +37,7 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 
+@SuppressWarnings("deprecation")
 class MongoClientImpl implements MongoClient {
     private static final Logger LOGGER = Loggers.getLogger("client");
     private final Cluster cluster;

driver-async/src/main/com/mongodb/async/client/MongoClientSettings.java

@@ -48,8 +48,10 @@
  * Various settings to control the behavior of a {@code MongoClient}.
  *
  * @since 3.0
+ * @deprecated use {@link com.mongodb.MongoClientSettings} instead
  */
 @Immutable
+@Deprecated
 public final class MongoClientSettings {
     private final com.mongodb.MongoClientSettings wrapped;
     private final SocketSettings heartbeatSocketSettings;
@@ -74,46 +76,40 @@ public static Builder builder(final MongoClientSettings settings) {
         return new Builder(settings);
     }
 
+    static MongoClientSettings createFromClientSettings(final com.mongodb.MongoClientSettings wrapped) {
+        return new Builder(wrapped).build();
+    }
+
     /**
      * A builder for {@code MongoClientSettings} so that {@code MongoClientSettings} can be immutable, and to support easier construction
      * through chaining.
      */
     @NotThreadSafe
     public static final class Builder {
+        private final com.mongodb.MongoClientSettings.Builder wrappedBuilder;
         private List<MongoCredential> credentialList = Collections.emptyList();
-        private final com.mongodb.MongoClientSettings.Builder wrappedBuilder = com.mongodb.MongoClientSettings.builder();
         private SocketSettings.Builder heartbeatSocketSettingsBuilder = null;
 
         private Builder() {
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder();
         }
 
-        @SuppressWarnings("deprecation")
-        private Builder(final MongoClientSettings settings) {
+        private Builder(final com.mongodb.MongoClientSettings settings) {
             notNull("settings", settings);
-            credentialList = new ArrayList<MongoCredential>(settings.credentialList);
-
-            wrappedBuilder.commandListenerList(new ArrayList<CommandListener>(settings.getCommandListeners()));
-            wrappedBuilder.codecRegistry(settings.getCodecRegistry());
-            wrappedBuilder.readPreference(settings.getReadPreference());
-            wrappedBuilder.writeConcern(settings.getWriteConcern());
-            wrappedBuilder.retryWrites(settings.getRetryWrites());
-            wrappedBuilder.readConcern(settings.getReadConcern());
-            wrappedBuilder.applicationName(settings.getApplicationName());
-            wrappedBuilder.compressorList(new ArrayList<MongoCompressor>(settings.getCompressorList()));
-
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder(settings);
             MongoCredential credential = settings.getCredential();
             if (credential != null) {
-                wrappedBuilder.credential(credential);
+                credentialList(singletonList(credential));
             }
+        }
 
-            clusterSettings(settings.getClusterSettings());
-            serverSettings(settings.getServerSettings());
-            socketSettings(settings.getSocketSettings());
+        @SuppressWarnings("deprecation")
+        private Builder(final MongoClientSettings settings) {
+            this(notNull("settings", settings).wrapped);
+            credentialList = new ArrayList<MongoCredential>(settings.credentialList);
             if (settings.heartbeatSocketSettings != null) {
                 heartbeatSocketSettings(settings.heartbeatSocketSettings);
             }
-            connectionPoolSettings(settings.getConnectionPoolSettings());
-            sslSettings(settings.getSslSettings());
         }
 
         /**
@@ -631,9 +627,9 @@ public SocketSettings getSocketSettings() {
 
     /**
      * Gets the connection settings for the heartbeat thread (the background task that checks the state of the cluster) wrapped in a
-     * settings object. This settings object uses the values for heartbeatConnectTimeout, heartbeatSocketTimeout and socketKeepAlive.
+     * settings object.
      *
-     * @return a SocketSettings object populated with the heartbeat connection settings from this {@code MongoClientSettings} instance.
+     * @return the SocketSettings for the heartbeat thread
      * @see com.mongodb.connection.SocketSettings
      */
     public SocketSettings getHeartbeatSocketSettings() {