Validate timeoutMode before getting a binding

Author: rozza

driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java

@@ -45,7 +45,6 @@
 import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.OperationHelper.addMaxTimeMSToNonTailableCursor;
-import static com.mongodb.internal.operation.OperationHelper.validateTimeoutMode;
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.executeRetryableRead;
@@ -191,7 +190,6 @@ private CommandCreator getCommandCreator() {
     }
 
     BsonDocument getCommand(final OperationContext operationContext, final int maxWireVersion) {
-        validateTimeoutMode(operationContext, timeoutMode);
         BsonDocument commandDocument = new BsonDocument("aggregate", aggregateTarget.create());
         appendReadConcernToCommand(operationContext.getSessionContext(), maxWireVersion, commandDocument);
         commandDocument.put("pipeline", pipelineCreator.create());

driver-core/src/main/com/mongodb/internal/operation/FindOperation.java

@@ -54,7 +54,6 @@
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.OperationHelper.addMaxTimeMSToNonTailableCursor;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
-import static com.mongodb.internal.operation.OperationHelper.validateTimeoutMode;
 import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 import static com.mongodb.internal.operation.ServerVersionHelper.MIN_WIRE_VERSION;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
@@ -370,7 +369,6 @@ <R> CommandReadOperation<R> createExplainableOperation(@Nullable final ExplainVe
     }
 
     private BsonDocument getCommand(final OperationContext operationContext, final int maxWireVersion) {
-        validateTimeoutMode(operationContext, timeoutMode);
         BsonDocument commandDocument = new BsonDocument("find", new BsonString(namespace.getCollectionName()));
 
         appendReadConcernToCommand(operationContext.getSessionContext(), maxWireVersion, commandDocument);

driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java

@@ -53,7 +53,6 @@
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.OperationHelper.addMaxTimeMSToNonTailableCursor;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
-import static com.mongodb.internal.operation.OperationHelper.validateTimeoutMode;
 import static com.mongodb.internal.operation.SingleBatchCursor.createEmptySingleBatchCursor;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.createReadCommandAndExecute;
@@ -79,7 +78,7 @@ public class ListCollectionsOperation<T> implements AsyncReadOperation<AsyncBatc
     private boolean nameOnly;
     private boolean authorizedCollections;
     private BsonValue comment;
-    private TimeoutMode timeoutMode;
+    private TimeoutMode timeoutMode = TimeoutMode.CURSOR_LIFETIME;
 
     public ListCollectionsOperation(final String databaseName, final Decoder<T> decoder) {
         this.databaseName = notNull("databaseName", databaseName);
@@ -216,7 +215,6 @@ private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTran
 
     private CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
-            validateTimeoutMode(operationContext, timeoutMode);
             BsonDocument commandDocument = new BsonDocument("listCollections", new BsonInt32(1))
                     .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
             putIfNotNull(commandDocument, "filter", filter);

driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java

@@ -51,7 +51,6 @@
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.OperationHelper.addMaxTimeMSToNonTailableCursor;
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
-import static com.mongodb.internal.operation.OperationHelper.validateTimeoutMode;
 import static com.mongodb.internal.operation.SingleBatchCursor.createEmptySingleBatchCursor;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandReadTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.createReadCommandAndExecute;
@@ -71,7 +70,7 @@ public class ListIndexesOperation<T> implements AsyncReadOperation<AsyncBatchCur
     private boolean retryReads;
     private int batchSize;
     private BsonValue comment;
-    private TimeoutMode timeoutMode;
+    private TimeoutMode timeoutMode = TimeoutMode.CURSOR_LIFETIME;
 
     public ListIndexesOperation(final MongoNamespace namespace, final Decoder<T> decoder) {
         this.namespace = notNull("namespace", namespace);
@@ -166,7 +165,6 @@ public void executeAsync(final AsyncReadBinding binding, final SingleResultCallb
 
     private CommandCreator getCommandCreator() {
         return (operationContext, serverDescription, connectionDescription) -> {
-            validateTimeoutMode(operationContext, timeoutMode);
             BsonDocument commandDocument = new BsonDocument("listIndexes", new BsonString(namespace.getCollectionName()))
                     .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
             addMaxTimeMSToNonTailableCursor(commandDocument, timeoutMode, operationContext);

driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java

@@ -51,12 +51,6 @@
 final class OperationHelper {
     public static final Logger LOGGER = Loggers.getLogger("operation");
 
-    static void validateTimeoutMode(final OperationContext operationContext, @Nullable final TimeoutMode timeoutMode) {
-        if (timeoutMode != null && !operationContext.getTimeoutContext().hasTimeoutMS()) {
-            throw new MongoClientException("TimeoutMode requires timeoutMS to be set.");
-        }
-    }
-
     static void validateCollationAndWriteConcern(@Nullable final Collation collation, final WriteConcern writeConcern) {
         if (collation != null && !writeConcern.isAcknowledged()) {
             throw new MongoClientException("Specifying collation with an unacknowledged WriteConcern is not supported");

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/BatchCursorPublisher.java

@@ -107,10 +107,17 @@ public Publisher<T> batchSize(final int batchSize) {
     }
 
     public Publisher<T> timeoutMode(final TimeoutMode timeoutMode) {
+        if (mongoOperationPublisher.getTimeoutSettings().getTimeoutMS() == null) {
+            throw new IllegalArgumentException("TimeoutMode requires timeoutMS to be set.");
+        }
         this.timeoutMode = timeoutMode;
         return this;
     }
 
+    protected void setDefaultTimeoutMode(final TimeoutMode timeoutMode) {
+        this.timeoutMode = timeoutMode;
+    }
+
     @Nullable
     public TimeoutMode getTimeoutMode() {
         return timeoutMode;

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ChangeStreamPublisherImpl.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.reactivestreams.client.internal;
 
+import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
@@ -83,6 +84,7 @@ private ChangeStreamPublisherImpl(
         this.pipeline = pipeline;
         this.codec = codec;
         this.changeStreamLevel = changeStreamLevel;
+        setDefaultTimeoutMode(TimeoutMode.ITERATION);
     }
 
     @Override

driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java

@@ -89,7 +89,7 @@ public ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, fin
         this.codec = ChangeStreamDocument.createCodec(notNull("resultClass", resultClass), codecRegistry);
         this.changeStreamLevel = notNull("changeStreamLevel", changeStreamLevel);
         this.operations = new SyncOperations<>(namespace, resultClass, readPreference, codecRegistry, retryReads, timeoutSettings);
-        super.timeoutMode(TimeoutMode.ITERATION);
+        setDefaultTimeoutMode(TimeoutMode.ITERATION);
     }
 
     @Override

driver-sync/src/main/com/mongodb/client/internal/MongoIterableImpl.java

@@ -102,10 +102,17 @@ public TimeoutMode getTimeoutMode() {
     }
 
     public MongoIterable<TResult> timeoutMode(final TimeoutMode timeoutMode) {
+        if (timeoutSettings.getTimeoutMS() == null) {
+            throw new IllegalArgumentException("TimeoutMode requires timeoutMS to be set.");
+        }
         this.timeoutMode = timeoutMode;
         return this;
     }
 
+    protected void setDefaultTimeoutMode(final TimeoutMode timeoutMode) {
+        this.timeoutMode = timeoutMode;
+    }
+
     @Override
     public MongoCursor<TResult> iterator() {
         return new MongoBatchCursorAdapter<>(execute());