Remove setDefaultTimeoutMode

Author: rozza

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

@@ -17,6 +17,7 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.MongoNamespace;
+import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
@@ -71,7 +72,7 @@ public ChangeStreamOperation(final MongoNamespace namespace, final FullDocument
             final FullDocumentBeforeChange fullDocumentBeforeChange, final List<BsonDocument> pipeline, final Decoder<T> decoder,
             final ChangeStreamLevel changeStreamLevel) {
         this.wrapped = new AggregateOperationImpl<>(namespace, pipeline, RAW_BSON_DOCUMENT_CODEC, getAggregateTarget(),
-                getPipelineCreator());
+                getPipelineCreator()).timeoutMode(TimeoutMode.ITERATION);
         this.fullDocument = notNull("fullDocument", fullDocument);
         this.fullDocumentBeforeChange = notNull("fullDocumentBeforeChange", fullDocumentBeforeChange);
         this.decoder = notNull("decoder", decoder);

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

@@ -114,10 +114,6 @@ public Publisher<T> timeoutMode(final 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,7 +16,6 @@
 
 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;
@@ -84,7 +83,6 @@ 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

@@ -24,7 +24,6 @@
 import com.mongodb.client.MongoChangeStreamCursor;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoIterable;
-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;
@@ -89,7 +88,6 @@ 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);
-        setDefaultTimeoutMode(TimeoutMode.ITERATION);
     }
 
     @Override

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

@@ -109,10 +109,6 @@ public MongoIterable<TResult> timeoutMode(final TimeoutMode timeoutMode) {
         return this;
     }
 
-    protected void setDefaultTimeoutMode(final TimeoutMode timeoutMode) {
-        this.timeoutMode = timeoutMode;
-    }
-
     @Override
     public MongoCursor<TResult> iterator() {
         return new MongoBatchCursorAdapter<>(execute());

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java

@@ -305,23 +305,20 @@ private void assertOperation(final UnifiedTestContext context, final BsonDocumen
         OperationResult result = executeOperation(context, operation, operationIndex);
         context.getAssertionContext().push(ContextElement.ofCompletedOperation(operation, result, operationIndex));
 
-        if (operation.getBoolean("ignoreResultAndError", BsonBoolean.FALSE).getValue()
-                && result.getException() instanceof RuntimeException) {
-            // Just creating an iterable may result in an error - so throw if one exists.
-            throw (RuntimeException) result.getException();
-        } else  if (operation.containsKey("expectResult")) {
-            assertNull(context.getAssertionContext().getMessage("The operation expects a result but an exception occurred"),
-                    result.getException());
-            context.getValueMatcher().assertValuesMatch(operation.get("expectResult"), result.getResult());
-        } else if (operation.containsKey("expectError")) {
-            assertNotNull(context.getAssertionContext().getMessage("The operation expects an error but no exception was thrown"),
-                    result.getException());
-            context.getErrorMatcher().assertErrorsMatch(operation.getDocument("expectError"), result.getException());
-        } else {
-            assertNull(context.getAssertionContext().getMessage("The operation expects no error but an exception occurred"),
-                    result.getException());
+        if (!operation.getBoolean("ignoreResultAndError", BsonBoolean.FALSE).getValue()) {
+            if (operation.containsKey("expectResult")) {
+                assertNull(context.getAssertionContext().getMessage("The operation expects a result but an exception occurred"),
+                        result.getException());
+                context.getValueMatcher().assertValuesMatch(operation.get("expectResult"), result.getResult());
+            } else if (operation.containsKey("expectError")) {
+                assertNotNull(context.getAssertionContext().getMessage("The operation expects an error but no exception was thrown"),
+                        result.getException());
+                context.getErrorMatcher().assertErrorsMatch(operation.getDocument("expectError"), result.getException());
+            } else {
+                assertNull(context.getAssertionContext().getMessage("The operation expects no error but an exception occurred"),
+                        result.getException());
+            }
         }
-
         context.getAssertionContext().pop();
     }
 

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestFailureValidator.java

@@ -28,7 +28,6 @@
 import java.util.Collection;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
 
 public class UnifiedTestFailureValidator extends UnifiedSyncTest {
     private Throwable exception;
@@ -38,7 +37,6 @@ public UnifiedTestFailureValidator(@SuppressWarnings("unused") final String file
                                        final String schemaVersion, @Nullable final BsonArray runOnRequirements, final BsonArray entities,
                                        final BsonArray initialData, final BsonDocument definition) {
         super(schemaVersion, runOnRequirements, entities, initialData, definition);
-        assumeTrue(testDescription.equals("malformed operation fails if ignoreResultAndError is true"));
     }
 
     @Before