DOCSP-18073 connection guide update (#156)

* updated connection URI and connection options sections

Author: kyuan-mongodb

source/fundamentals/aggregation.txt

@@ -91,7 +91,7 @@ Connect to a MongoDB Deployment
 
        public static void main(String[] args) {
            // Replace the uri string with your MongoDB deployment's connection string
-           String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+           String uri = "<connection string uri>";
 
            MongoClient mongoClient = MongoClients.create(uri);
            MongoDatabase database = mongoClient.getDatabase("aggregation");

source/fundamentals/connection.txt

@@ -47,46 +47,45 @@ usage limits, such as max connections, apply to individual
 
 .. _connection-uri:
 
-Connection String
------------------
+Connection URI
+--------------
 
-The **connection string** (also known as a **connection uri**) provides
-instructions on how to connect to a MongoDB deployment. The driver
-URL interprets the connection string to determine where and how
-it should connect to MongoDB as well as how to behave while
-connected. The following example shows each part of the connection URI:
+The **connection URI** provides a set of instructions that the driver uses to
+connect to a MongoDB deployment. It instructs the driver on how it should
+connect to MongoDB and how it should behave while connected. The following
+example explains each part of a sample connection URI:
 
-.. figure:: /includes/figures/connection_string_parts.png
+.. figure:: /includes/figures/connection_uri_parts.png
    :alt: Connection String parts figure
 
-In this example, for the protocol, we use ``mongodb+srv`` which specifies the
-:manual:`DNS Seedlist Connection Format </reference/connection-string/#std-label-connections-dns-seedlist>`.
-This indicates that the hostname following it corresponds to the DNS SRV record of your
-MongoDB instance or deployment. If your instance or deployment does not have a
-DNS SRV record, use ``mongodb`` to specify the :manual:`Standard Connection
-Format </reference/connection-string/#standard-connection-string-format>`.
+In this example, we use the :manual:`Standard Connection String Format
+</reference/connection-string/#std-label-connections-standard-connection-string-format>`,
+``mongodb`` for the protocol. You can also use the :manual:`DNS Seed
+List Connection Format </reference/connection-string/#dns-seed-list-connection-format>`,
+``mongodb+srv``, if you want more flexibility of deployment and the
+ability to change the servers in rotation without reconfiguring clients.
 
 .. note::
 
-   If your deployment is on MongoDB Atlas, follow the
+   If your deployment is on MongoDB Atlas, see the
    :atlas:`Atlas driver connection guide </driver-connection?jmp=docs_driver_java>`
-   to retrieve your connection string.
+   and select Java from the language dropdown to retrieve your connection string.
 
-The next part of the connection string contains your username and password
-if you are using password-based authentication. Replace the value of ``user``
-with your username and ``pass`` with your password. If you are using an
-authentication mechanism that does not require a username and password, omit
-this part of the connection URI.
+The next part of the connection URI contains your credentials if you are
+using a password-based authentication mechanism. Replace the value of ``user``
+with your username and ``pass`` with your password. If your
+authentication mechanism does not require credentials, omit this part of
+the connection URI.
 
-The next part of the connection string specifies the hostname or IP address and
-port of your MongoDB instance. In the following example, we use ``sample-hostname``
-as the hostname and ``27017`` as the port. Replace these values to point to
-your MongoDB instance.
+The next part of the connection URI specifies the hostname or IP
+address, followed by the port of your MongoDB instance. In the example,
+we use ``sample.host`` as the hostname and ``27017`` as the port.
+Replace these values to refer to your MongoDB instance.
 
-The last part of the connection string contains connection and authentication
-options as parameters. In the following example, we set two connection options:
-``retryWrites=true`` and ``w=majority``. For more information on connection
-options, skip to the :ref:`connection options <connection-options>` section.
+The last part of the connection URI contains connection options as parameters. In the
+example, we set two connection options: ``maxPoolSize=20`` and
+``w=majority``. For more information on connection options, skip to the
+:ref:`connection-options` section of this guide.
 
 .. _connect-atlas-java-driver:
 
@@ -95,6 +94,7 @@ connect to MongoDB.
 
 .. literalinclude:: /includes/fundamentals/code-snippets/srv.java
    :language: java
+   :emphasize-lines: 17
 
 .. _java-other-ways-to-connect:
 
@@ -159,7 +159,7 @@ Select the tab corresponding to the code snippet you would like to see:
 
       .. code-block:: java
 
-         ConnectionString connectionString = new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017");
+         ConnectionString connectionString = new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017/");
          MongoClient mongoClient = MongoClients.create(connectionString);
 
    .. tab:: MongoClientSettings
@@ -230,14 +230,14 @@ using a method in the ``MongoClientSettings.Builder`` class.
       :tabid: connectionstring
 
       To enable compression with a `ConnectionString
-      <{+api+}/apidocs/mongodb-driver-sync/com/mongodb/ConnectionString.html>`__, use the parameter ``compressors``
+      <{+api+}/apidocs/mongodb-driver-core/com/mongodb/ConnectionString.html>`__, use the parameter ``compressors``
       in the connection string passed to
       ``MongoClients.create()``. You can specify one or more compression
       algorithms, separating multiple algorithms with commas:
 
       .. code-block:: java
 
-         ConnectionString connectionString = new ConnectionString("mongodb+srv://<user>:<password>@<cluster-url>?compressors=snappy,zlib,zstd");
+         ConnectionString connectionString = new ConnectionString("mongodb+srv://<user>:<password>@<cluster-url>/?compressors=snappy,zlib,zstd");
          MongoClient mongoClient = MongoClients.create(connectionString);
 
       Specify compression algorithms using the following strings:
@@ -350,12 +350,6 @@ parameters of the connection URI to specify the behavior of the client.
        constraints in other ways, use a
        :ref:`custom SSLContext <tls-custom-sslContext>`.
 
-   * - **sslInvalidHostNameAllowed**
-     - boolean
-     - Specifies that the driver should allow invalid hostnames in the
-       certificate for TLS/SSL connections. Superseded by
-       **tlsAllowInvalidHostnames**.
-
    * - **tlsAllowInvalidHostnames**
      - boolean
      - Specifies that the driver should allow invalid hostnames in the
@@ -383,7 +377,7 @@ parameters of the connection URI to specify the behavior of the client.
      - Specifies the maximum amount of time, in milliseconds, the Java
        driver will continue to use a pooled connection before closing the
        connection.
-
+   
    * - **journal**
      - boolean
      - Specifies that the driver must wait for the connected MongoDB
@@ -477,14 +471,14 @@ parameters of the connection URI to specify the behavior of the client.
      - boolean
      - Specifies that the driver must retry supported read operations
        if they fail due to a network error. Defaults to ``true``.
-
+   
    * - **uuidRepresentation**
      - string
      - Specifies the UUID representation to use for read and write
        operations. For more information, see the the driver documentation
        for the
        `MongoClientSettings.getUuidRepresentation() method <{+api+}/apidocs/mongodb-driver-core/com/mongodb/MongoClientSettings.html#getUuidRepresentation()>`__.
-
+   
    * - **directConnection**
      - boolean
      - Specifies that the driver must connect to the host directly.

source/fundamentals/connection/jndi.txt

@@ -45,7 +45,7 @@ JNDI DataSource.
                <bindings>
                   <object-factory name="java:global/MyMongoClient" module="org.mongodb" class="com.mongodb.client.MongoClientFactory">
                      <environment>
-                        <property name="connectionString" value="mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority"/>
+                        <property name="connectionString" value="<connection string uri>"/>
                      </environment>
                   </object-factory>
                </bindings>
@@ -78,7 +78,7 @@ JNDI DataSource.
                closeMethod="close"
                factory="com.mongodb.client.MongoClientFactory"
                singleton="true"
-               connectionString="mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority"/>
+               connectionString="<connection string uri>"/>
 
          .. note::
 

source/includes/figures/connection_string_parts.png

@@ -22,7 +22,7 @@
 public class AggTour {
     public static void main(String[] args) {
         // Replace the uri string with your MongoDB deployment's connection string
-        final String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+        final String uri = "<connection string uri>";
 
         MongoClient mongoClient = MongoClients.create(uri);
         MongoDatabase database = mongoClient.getDatabase("aggregation");

source/includes/figures/connection_uri_parts.png

@@ -25,7 +25,7 @@ public static void main(String[] args) {
                 .build();
 
         // Replace the uri string with your MongoDB deployment's connection string
-        String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+        String uri = "<connection string uri>";
 
         MongoClientSettings settings = MongoClientSettings.builder()
                 .applyConnectionString(new ConnectionString(uri))

source/includes/fundamentals/code-snippets/AggTour.java

@@ -11,11 +11,10 @@
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
-
 public class RunCommand {
     public static void main(String[] args) {
         // Replace the uri string with your MongoDB deployment's connection string
-        String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+        String uri = "mongodb://user:[email protected]:27017/?maxPoolSize=20&w=majority";
 
         try (MongoClient mongoClient = MongoClients.create(uri)) {
 

source/includes/fundamentals/code-snippets/VersionedApiExample.java

@@ -13,7 +13,7 @@
 public static void main( String[] args ) {
 
     // Replace the uri string with your MongoDB deployment's connection string
-    String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+    String uri = "<connection string uri>";
 
     try (MongoClient mongoClient = MongoClients.create(uri)) {
         MongoDatabase database = mongoClient.getDatabase("sample_mflix");

source/includes/fundamentals/code-snippets/srv.java

@@ -22,7 +22,7 @@ public static void main(String[] args) {
         CodecRegistry pojoCodecRegistry = fromRegistries(getDefaultCodecRegistry(), fromProviders(pojoCodecProvider));
 
         // Replace the uri string with your MongoDB deployment's connection string
-        String uri = "mongodb+srv://<user>:<password>@<cluster-url>?retryWrites=true&w=majority";
+        String uri = "<connection string uri>";
 
         try (MongoClient mongoClient = MongoClients.create(uri)) {
             MongoDatabase database = mongoClient.getDatabase("sample_mflix").withCodecRegistry(pojoCodecRegistry);