Now that MongoDB 3.6 release candidates are available, replace server version check for 3.5 with 3.6

Author: jyemin

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

@@ -190,7 +190,7 @@ private static OpCode getOpCode(final MessageSettings settings) {
     }
 
     private static boolean isServerVersionAtLeastThreeDotSix(final MessageSettings settings) {
-        return settings.getServerVersion().compareTo(new ServerVersion(3, 5)) >= 0;
+        return settings.getServerVersion().compareTo(new ServerVersion(3, 6)) >= 0;
     }
 
 }

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

@@ -380,7 +380,7 @@ static boolean serverIsAtLeastVersionThreeDotFour(final ConnectionDescription de
     }
 
     static boolean serverIsAtLeastVersionThreeDotSix(final ConnectionDescription description) {
-        return serverIsAtLeastVersion(description, new ServerVersion(3, 5));
+        return serverIsAtLeastVersion(description, new ServerVersion(3, 6));
     }
 
     static boolean serverIsAtLeastVersion(final ConnectionDescription description, final ServerVersion serverVersion) {

driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy

@@ -191,7 +191,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         async << [true, false]
     }
 
-    @IgnoreIf({ !(serverVersionAtLeast(3, 5) && isDiscoverableReplicaSet()) })
+    @IgnoreIf({ !(serverVersionAtLeast(3, 6) && isDiscoverableReplicaSet()) })
     def 'should support changeStreams'() {
         given:
         def expected = [createExpectedChangeNotification(namespace, 0), createExpectedChangeNotification(namespace, 1)]

driver-core/src/test/functional/com/mongodb/operation/ChangeStreamOperationSpecification.groovy

@@ -43,7 +43,7 @@ import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
-@IgnoreIf({ !(serverVersionAtLeast(3, 5) && !isStandalone()) })
+@IgnoreIf({ !(serverVersionAtLeast(3, 6) && !isStandalone()) })
 class ChangeStreamOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should have the correct defaults'() {

driver-core/src/test/functional/com/mongodb/operation/FindAndUpdateOperationSpecification.groovy

@@ -355,7 +355,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
         async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should support array filters'() {
         given:
         def documentOne = Document.parse('{_id: 1, y: [ {b: 3}, {b: 1}]}')

driver-core/src/test/functional/com/mongodb/operation/FindOperationSpecification.groovy

@@ -67,7 +67,6 @@ import static com.mongodb.CursorType.TailableAwait
 import static com.mongodb.ExplainVerbosity.QUERY_PLANNER
 import static com.mongodb.connection.ServerType.STANDALONE
 import static com.mongodb.operation.ReadConcernHelper.appendReadConcernToCommand
-import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.junit.Assert.assertEquals
@@ -471,7 +470,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
 
         then:
         Document profileDocument = profileCollectionHelper.find().get(0)
-        if (serverVersionAtLeast(asList(3, 5, 8))) {
+        if (serverVersionAtLeast(3, 6)) {
             assertEquals(expectedComment, ((Document) profileDocument.get('command')).get('comment'))
         } else if (serverVersionAtLeast(3, 2)) {
             assertEquals(expectedComment, ((Document) profileDocument.get('query')).get('comment'))

driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy

@@ -881,7 +881,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should support array filters'() {
         given:
         def documentOne = BsonDocument.parse('{_id: 1, y: [ {b: 3}, {b: 1}]}')

driver/src/examples/documentation/DocumentationSamples.java

@@ -20,13 +20,11 @@
 import com.mongodb.DatabaseTestCase;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-// imports required for change streams
 import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
 import org.bson.BsonDocument;
-// end required change streams imports
 import org.bson.BsonType;
 import org.bson.Document;
 import org.junit.After;
@@ -41,8 +39,6 @@
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.Fixture.getDefaultDatabaseName;
 import static com.mongodb.Fixture.getMongoClient;
-
-// imports required for filters, projections and updates
 import static com.mongodb.client.model.Filters.all;
 import static com.mongodb.client.model.Filters.and;
 import static com.mongodb.client.model.Filters.elemMatch;
@@ -64,14 +60,17 @@
 import static com.mongodb.client.model.Updates.combine;
 import static com.mongodb.client.model.Updates.currentDate;
 import static com.mongodb.client.model.Updates.set;
-// end required filters, projections and updates imports
-
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
+// imports required for change streams
+// end required change streams imports
+// imports required for filters, projections and updates
+// end required filters, projections and updates imports
+
 
 public final class DocumentationSamples extends DatabaseTestCase {
 
@@ -615,7 +614,7 @@ public void testDeletions() {
 
     @Test
     public void testWatch() {
-        assumeTrue(isDiscoverableReplicaSet() && serverVersionAtLeast(3, 5));
+        assumeTrue(isDiscoverableReplicaSet() && serverVersionAtLeast(3, 6));
 
         final MongoCollection<Document> inventory = collection;
         final AtomicBoolean stop = new AtomicBoolean(false);

driver/src/test/functional/com/mongodb/DBCursorTest.java

@@ -30,7 +30,6 @@
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
@@ -418,7 +417,7 @@ public void testSettingACommentInsertsCommentIntoProfileCollectionWhenProfilingI
             assertEquals(1, profileCollection.count());
 
             DBObject profileDocument = profileCollection.findOne();
-            if (serverVersionAtLeast(asList(3, 5, 8))) {
+            if (serverVersionAtLeast(3, 6)) {
                 assertEquals(expectedComment, ((DBObject) profileDocument.get("command")).get("comment"));
             } else if (serverVersionAtLeast(3, 2)) {
                 assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("comment"));

driver/src/test/functional/com/mongodb/MongoClientSessionSpecification.groovy

@@ -39,7 +39,7 @@ import static com.mongodb.MongoCredential.createCredential
 
 class MongoClientSessionSpecification extends FunctionalSpecification {
 
-    @IgnoreIf({ serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ serverVersionAtLeast(3, 6) })
     def 'should throw MongoClientException starting a session when sessions are not supported'() {
         when:
         Fixture.getMongoClient().startSession(ClientSessionOptions.builder().build())
@@ -48,7 +48,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         thrown(MongoClientException)
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should create session with correct defaults'() {
         when:
         def options = ClientSessionOptions.builder().build()
@@ -64,7 +64,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         clientSession.getServerSession() != null
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'cluster time should advance'() {
         given:
         def firstOperationTime = new BsonTimestamp(42, 1)
@@ -105,7 +105,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         clientSession.getClusterTime() == secondClusterTime
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'operation time should advance'() {
         given:
         def firstOperationTime = new BsonTimestamp(42, 1)
@@ -143,7 +143,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         clientSession.getOperationTime() == secondOperationTime
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'methods that use the session should throw if the session is closed'() {
         given:
         def options = ClientSessionOptions.builder().build()
@@ -175,7 +175,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         thrown(IllegalStateException)
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'informational methods should not throw if the session is closed'() {
         given:
         def options = ClientSessionOptions.builder().build()
@@ -192,7 +192,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         true
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should apply causally consistent session option to client session'() {
         when:
         def clientSession = Fixture.getMongoClient().startSession(ClientSessionOptions.builder()
@@ -207,7 +207,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         causallyConsistent << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'client session should have server session with valid identifier'() {
         given:
         def clientSession = Fixture.getMongoClient().startSession(ClientSessionOptions.builder().build())
@@ -223,7 +223,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         identifier.getBinary('id').data.length == 16
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should use a default session'() {
         given:
         def commandListener = new TestCommandListener()
@@ -243,7 +243,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         client?.close()
     }
 
-    @IgnoreIf({ serverVersionAtLeast(3, 5) })
+    @IgnoreIf({ serverVersionAtLeast(3, 6) })
     def 'should not use a default session when sessions are not supported'() {
         given:
         def commandListener = new TestCommandListener()
@@ -268,7 +268,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
     // This test is inherently racy as it's possible that the server _does_ replicate fast enough and therefore the test passes anyway
     // even if causal consistency was not actually in effect.  For that reason the test iterates a number of times in order to increase
     // confidence that it's really causal consistency that is causing the test to succeed
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) || isStandalone() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
     @Category(Slow)
     def 'should find inserted document on a secondary when causal consistency is enabled'() {
         given:
@@ -300,7 +300,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
         readConcern << [ReadConcern.DEFAULT, ReadConcern.LOCAL, ReadConcern.MAJORITY]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(3, 5) || !isAuthenticated() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isAuthenticated() })
     @SuppressWarnings('deprecation')
     def 'should not use a default session when there is more than one authenticated user'() {
         given: