Merge branch 'master' into CSOT

Author: rozza

driver-core/src/main/com/mongodb/assertions/Assertions.java

@@ -92,7 +92,7 @@ public static <T> Iterable<T> notNullElements(final String name, final Iterable<
     public static <T> T notNull(final String name, final T value, final SingleResultCallback<?> callback) {
         if (value == null) {
             IllegalArgumentException exception = new IllegalArgumentException(name + " can not be null");
-            callback.onResult(null, exception);
+            callback.completeExceptionally(exception);
             throw exception;
         }
         return value;
@@ -122,7 +122,7 @@ public static void isTrue(final String name, final boolean condition) {
     public static void isTrue(final String name, final boolean condition, final SingleResultCallback<?> callback) {
         if (!condition) {
             IllegalStateException exception = new IllegalStateException("state should be: " + name);
-            callback.onResult(null, exception);
+            callback.completeExceptionally(exception);
             throw exception;
         }
     }

driver-core/src/main/com/mongodb/connection/AsyncCompletionHandler.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.lang.Nullable;
 
 /**
@@ -38,4 +39,17 @@ public interface AsyncCompletionHandler<T> {
      * @param t the exception that describes the failure
      */
     void failed(Throwable t);
+
+    /**
+     * @return this handler as a callback
+     */
+    default SingleResultCallback<T> asCallback() {
+        return (r, t) -> {
+            if (t != null) {
+                failed(t);
+            } else {
+                completed(r);
+            }
+        };
+    }
 }

driver-core/src/main/com/mongodb/connection/ClusterSettings.java

@@ -151,10 +151,12 @@ public Builder srvHost(final String srvHost) {
 
         /**
          * Sets the maximum number of hosts to connect to when using SRV protocol.
+         * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
          *
          * @param srvMaxHosts the maximum number of hosts to connect to when using SRV protocol
          * @return this
          * @since 4.4
+         * @see #getSrvMaxHosts()
          */
         public Builder srvMaxHosts(final Integer srvMaxHosts) {
             this.srvMaxHosts = srvMaxHosts;
@@ -168,15 +170,16 @@ public Builder srvMaxHosts(final Integer srvMaxHosts) {
          * The SRV resource record (<a href="https://www.rfc-editor.org/rfc/rfc2782">RFC 2782</a>)
          * service name, which is limited to 15 characters
          * (<a href="https://www.rfc-editor.org/rfc/rfc6335#section-5.1">RFC 6335 section 5.1</a>).
-         * If specified, it is combined with the single host name specified by
-         * {@link #getHosts()} as follows: {@code _srvServiceName._tcp.hostName}. The combined string is an SRV resource record
+         * It is combined with the host name specified by
+         * {@link #getSrvHost()} as follows: {@code _srvServiceName._tcp.hostName}. The combined string is an SRV resource record
          * name (<a href="https://www.rfc-editor.org/rfc/rfc1035#section-2.3.1">RFC 1035 section 2.3.1</a>), which is limited to 255
          * characters (<a href="https://www.rfc-editor.org/rfc/rfc1035#section-2.3.4">RFC 1035 section 2.3.4</a>).
          * </p>
          *
          * @param srvServiceName the SRV service name
          * @return this
          * @since 4.5
+         * @see #getSrvServiceName()
         */
         public Builder srvServiceName(final String srvServiceName) {
             this.srvServiceName = notNull("srvServiceName", srvServiceName);
@@ -219,6 +222,7 @@ public Builder mode(final ClusterConnectionMode mode) {
 
         /**
          * Sets the required replica set name for the cluster.
+         * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
          *
          * @param requiredReplicaSetName the required replica set name.
          * @return this
@@ -231,9 +235,11 @@ public Builder requiredReplicaSetName(@Nullable final String requiredReplicaSetN
 
         /**
          * Sets the required cluster type for the cluster.
+         * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
          *
          * @param requiredClusterType the required cluster type
          * @return this
+         * @see #getRequiredClusterType()
          */
         public Builder requiredClusterType(final ClusterType requiredClusterType) {
             this.requiredClusterType = notNull("requiredClusterType", requiredClusterType);
@@ -384,9 +390,11 @@ public String getSrvHost() {
 
     /**
      * Gets the maximum number of hosts to connect to when using SRV protocol.
+     * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
      *
      * @return the maximum number of hosts to connect to when using SRV protocol.  Defaults to null.
      * @since 4.4
+     * @see Builder#srvMaxHosts(Integer)
      */
     @Nullable
     public Integer getSrvMaxHosts() {
@@ -400,14 +408,15 @@ public Integer getSrvMaxHosts() {
       * The SRV resource record (<a href="https://www.rfc-editor.org/rfc/rfc2782">RFC 2782</a>)
       * service name, which is limited to 15 characters
       * (<a href="https://www.rfc-editor.org/rfc/rfc6335#section-5.1">RFC 6335 section 5.1</a>).
-      * If specified, it is combined with the single host name specified by
-      * {@link #getHosts()} as follows: {@code _srvServiceName._tcp.hostName}. The combined string is an SRV resource record
+      * It is combined with the host name specified by
+      * {@link #getSrvHost()} as follows: {@code _srvServiceName._tcp.hostName}. The combined string is an SRV resource record
       * name (<a href="https://www.rfc-editor.org/rfc/rfc1035#section-2.3.1">RFC 1035 section 2.3.1</a>), which is limited to 255
       * characters (<a href="https://www.rfc-editor.org/rfc/rfc1035#section-2.3.4">RFC 1035 section 2.3.4</a>).
       * </p>
       *
       * @return the SRV service name, which defaults to {@code "mongodb"}
       * @since 4.5
+      * @see Builder#srvServiceName(String)
      */
     public String getSrvServiceName() {
         return srvServiceName;
@@ -433,15 +442,18 @@ public ClusterConnectionMode getMode() {
 
     /**
      * Gets the required cluster type
+     * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
      *
      * @return the required cluster type
+     * @see Builder#requiredClusterType(ClusterType)
      */
     public ClusterType getRequiredClusterType() {
         return requiredClusterType;
     }
 
     /**
      * Gets the required replica set name.
+     * This setting is not used if {@link #getMode()} is {@link ClusterConnectionMode#LOAD_BALANCED}.
      *
      * @return the required replica set name
      * @see Builder#requiredReplicaSetName(String)

driver-core/src/main/com/mongodb/internal/async/AsyncConsumer.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present 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 com.mongodb.internal.async;
+
+/**
+ * See {@link AsyncRunnable}.
+ * <p>
+ * This class is not part of the public API and may be removed or changed at any time
+ */
+@FunctionalInterface
+public interface AsyncConsumer<T> extends AsyncFunction<T, Void> {
+}

driver-core/src/main/com/mongodb/internal/async/AsyncFunction.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present 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 com.mongodb.internal.async;
+
+import com.mongodb.lang.Nullable;
+
+/**
+ * See {@link AsyncRunnable}
+ * <p>
+ * This class is not part of the public API and may be removed or changed at any time
+ */
+@FunctionalInterface
+public interface AsyncFunction<T, R> {
+    /**
+     * This should not be called externally, but should be implemented as a
+     * lambda. To "finish" an async chain, use one of the "finish" methods.
+     *
+     * @param value A {@code @}{@link Nullable} argument of the asynchronous function.
+     * @param callback the callback
+     */
+    void unsafeFinish(T value, SingleResultCallback<R> callback);
+}