Remove support for MongoDB 3.6

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

@@ -49,7 +49,6 @@
 import static com.mongodb.internal.connection.ReadConcernHelper.getReadConcernDocument;
 import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_TWO_WIRE_VERSION;
 import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_ZERO_WIRE_VERSION;
-import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION;
 
 /**
  * A command message that uses OP_MSG or OP_QUERY to send the command.
@@ -270,9 +269,7 @@ private void addServerApiElements(final List<BsonElement> extraElements) {
     }
 
     private void checkServerVersionForTransactionSupport() {
-        int wireVersion = getSettings().getMaxWireVersion();
-        if (wireVersion < FOUR_DOT_ZERO_WIRE_VERSION
-                || (wireVersion < FOUR_DOT_TWO_WIRE_VERSION && getSettings().getServerType() == SHARD_ROUTER)) {
+        if (getSettings().getMaxWireVersion() < FOUR_DOT_TWO_WIRE_VERSION && getSettings().getServerType() == SHARD_ROUTER) {
             throw new MongoClientException("Transactions are not supported by the MongoDB cluster to which this client is connected.");
         }
     }
@@ -287,12 +284,12 @@ private void addReadConcernDocument(final List<BsonElement> extraElements, final
 
     private static OpCode getOpCode(final MessageSettings settings, final ClusterConnectionMode clusterConnectionMode,
             @Nullable final ServerApi serverApi) {
-        return isServerVersionAtLeastThreeDotSix(settings) || clusterConnectionMode == LOAD_BALANCED || serverApi != null
+        return isServerVersionKnown(settings) || clusterConnectionMode == LOAD_BALANCED || serverApi != null
                 ? OpCode.OP_MSG
                 : OpCode.OP_QUERY;
     }
 
-    private static boolean isServerVersionAtLeastThreeDotSix(final MessageSettings settings) {
-        return settings.getMaxWireVersion() >= THREE_DOT_SIX_WIRE_VERSION;
+    private static boolean isServerVersionKnown(final MessageSettings settings) {
+        return settings.getMaxWireVersion() >= FOUR_DOT_ZERO_WIRE_VERSION;
     }
 }

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

@@ -31,20 +31,13 @@ public final class ServerVersionHelper {
     public static final int FOUR_DOT_FOUR_WIRE_VERSION = 9;
     public static final int FIVE_DOT_ZERO_WIRE_VERSION = 12;
     public static final int SIX_DOT_ZERO_WIRE_VERSION = 17;
-    private static final int SEVEN_DOT_ZERO_WIRE_VERSION = 21;
-
-    public static boolean serverIsAtLeastVersionFourDotTwo(final ConnectionDescription description) {
-        return description.getMaxWireVersion() >= FOUR_DOT_TWO_WIRE_VERSION;
-    }
+    public static final int SEVEN_DOT_ZERO_WIRE_VERSION = 21;
+    public static final int LATEST_WIRE_VERSION = SEVEN_DOT_ZERO_WIRE_VERSION;
 
     public static boolean serverIsAtLeastVersionFourDotFour(final ConnectionDescription description) {
         return description.getMaxWireVersion() >= FOUR_DOT_FOUR_WIRE_VERSION;
     }
 
-    public static boolean serverIsAtLeastVersionFiveDotZero(final ConnectionDescription description) {
-        return description.getMaxWireVersion() >= FIVE_DOT_ZERO_WIRE_VERSION;
-    }
-
     public static boolean serverIsLessThanVersionFourDotTwo(final ConnectionDescription description) {
         return description.getMaxWireVersion() < FOUR_DOT_TWO_WIRE_VERSION;
     }

driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy

@@ -43,7 +43,7 @@ import java.nio.ByteBuffer
 
 import static com.mongodb.internal.connection.SplittablePayload.Type.INSERT
 import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_ZERO_WIRE_VERSION
-import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
+import static com.mongodb.internal.operation.ServerVersionHelper.LATEST_WIRE_VERSION
 
 class CommandMessageSpecification extends Specification {
 
@@ -55,7 +55,7 @@ class CommandMessageSpecification extends Specification {
         given:
         def message = new CommandMessage(namespace, command, fieldNameValidator, readPreference,
                 MessageSettings.builder()
-                        .maxWireVersion(THREE_DOT_SIX_WIRE_VERSION)
+                        .maxWireVersion(LATEST_WIRE_VERSION)
                         .serverType(serverType as ServerType)
                         .sessionSupported(true)
                         .build(),
@@ -148,24 +148,22 @@ class CommandMessageSpecification extends Specification {
 
         def expectedCommandDocument = new BsonDocument('insert', new BsonString('coll')).append('documents',
                 new BsonArray([new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(2))]))
-        if (maxWireVersion == THREE_DOT_SIX_WIRE_VERSION) {
-            expectedCommandDocument.append('$db', new BsonString(namespace.getDatabaseName()))
-        }
+        expectedCommandDocument.append('$db', new BsonString(namespace.getDatabaseName()))
         then:
         commandDocument == expectedCommandDocument
 
 
         where:
         [maxWireVersion, originalCommandDocument, payload] << [
                 [
-                        THREE_DOT_SIX_WIRE_VERSION,
+                        LATEST_WIRE_VERSION,
                         new BsonDocument('insert', new BsonString('coll')),
                         new SplittablePayload(INSERT, [new BsonDocument('_id', new BsonInt32(1)),
                                                        new BsonDocument('_id', new BsonInt32(2))]
                                 .withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) } ),
                 ],
                 [
-                        THREE_DOT_SIX_WIRE_VERSION,
+                        LATEST_WIRE_VERSION,
                         new BsonDocument('insert', new BsonString('coll')).append('documents',
                                 new BsonArray([new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(2))])),
                         null
@@ -176,7 +174,7 @@ class CommandMessageSpecification extends Specification {
     def 'should respect the max message size'() {
         given:
         def maxMessageSize = 1024
-        def messageSettings = MessageSettings.builder().maxMessageSize(maxMessageSize).maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def messageSettings = MessageSettings.builder().maxMessageSize(maxMessageSize).maxWireVersion(LATEST_WIRE_VERSION).build()
         def insertCommand = new BsonDocument('insert', new BsonString(namespace.collectionName))
         def payload = new SplittablePayload(INSERT, [new BsonDocument('_id', new BsonInt32(1)).append('a', new BsonBinary(new byte[913])),
                                                      new BsonDocument('_id', new BsonInt32(2)).append('b', new BsonBinary(new byte[441])),
@@ -262,7 +260,7 @@ class CommandMessageSpecification extends Specification {
 
     def 'should respect the max batch count'() {
         given:
-        def messageSettings = MessageSettings.builder().maxBatchCount(2).maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def messageSettings = MessageSettings.builder().maxBatchCount(2).maxWireVersion(LATEST_WIRE_VERSION).build()
         def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900])),
                                                      new BsonDocument('b', new BsonBinary(new byte[450])),
                                                      new BsonDocument('c', new BsonBinary(new byte[450]))]
@@ -309,7 +307,7 @@ class CommandMessageSpecification extends Specification {
     def 'should throw if payload document bigger than max document size'() {
         given:
         def messageSettings = MessageSettings.builder().maxDocumentSize(900)
-                .maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+                .maxWireVersion(LATEST_WIRE_VERSION).build()
         def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900]))]
                 .withIndex().collect { doc, i -> new WriteRequestWithIndex(new InsertRequest(doc), i) })
         def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
@@ -326,25 +324,6 @@ class CommandMessageSpecification extends Specification {
         thrown(BsonMaximumSizeExceededException)
     }
 
-    def 'should throw if wire version does not support transactions'() {
-        given:
-        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
-        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonInt32(1))])
-        def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
-                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE, null)
-        def output = new BasicOutputBuffer()
-        def sessionContext = Stub(SessionContext) {
-            getReadConcern() >> ReadConcern.DEFAULT
-            hasActiveTransaction() >> true
-        }
-
-        when:
-        message.encode(output, sessionContext)
-
-        then:
-        thrown(MongoClientException)
-    }
-
     def 'should throw if wire version and sharded cluster does not support transactions'() {
         given:
         def messageSettings = MessageSettings.builder().serverType(ServerType.SHARD_ROUTER)

driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionSpecification.groovy

@@ -67,7 +67,7 @@ import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBat
 import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize
 import static com.mongodb.internal.connection.MessageHelper.LEGACY_HELLO
 import static com.mongodb.internal.connection.MessageHelper.LEGACY_HELLO_LOWER
-import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
+import static com.mongodb.internal.operation.ServerVersionHelper.LATEST_WIRE_VERSION
 import static java.util.concurrent.TimeUnit.NANOSECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
@@ -81,7 +81,7 @@ class InternalStreamConnectionSpecification extends Specification {
     def serverAddress = new ServerAddress()
     def connectionId = new ConnectionId(SERVER_ID, 1, 1)
     def commandListener = new TestCommandListener()
-    def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+    def messageSettings = MessageSettings.builder().maxWireVersion(LATEST_WIRE_VERSION).build()
 
     def connectionDescription = new ConnectionDescription(connectionId, 3,
             ServerType.STANDALONE, getDefaultMaxWriteBatchSize(), getDefaultMaxDocumentSize(), getDefaultMaxMessageSize(), [])

driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy

@@ -41,6 +41,7 @@ import spock.lang.Specification
 
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
 import static com.mongodb.connection.ClusterConnectionMode.SINGLE
+import static com.mongodb.internal.operation.ServerVersionHelper.LATEST_WIRE_VERSION
 import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
 
 class LoggingCommandEventSenderSpecification extends Specification {
@@ -49,7 +50,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         given:
         def connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()))
         def namespace = new MongoNamespace('test.driver')
-        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+            def messageSettings = MessageSettings.builder().maxWireVersion(LATEST_WIRE_VERSION).build()
         def commandListener = new TestCommandListener()
         def commandDocument = new BsonDocument('ping', new BsonInt32(1))
         def replyDocument = new BsonDocument('ok', new BsonInt32(1))
@@ -95,7 +96,7 @@ class LoggingCommandEventSenderSpecification extends Specification {
         def connectionDescription = new ConnectionDescription(serverId)
                 .withConnectionId(new ConnectionId(serverId, 42, 1000))
         def namespace = new MongoNamespace('test.driver')
-        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def messageSettings = MessageSettings.builder().maxWireVersion(LATEST_WIRE_VERSION).build()
         def commandDocument = new BsonDocument('ping', new BsonInt32(1))
         def replyDocument = new BsonDocument('ok', new BsonInt32(42))
         def failureException = new MongoInternalException('failure!')

driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java

@@ -44,7 +44,7 @@
 
 import static com.mongodb.internal.connection.ProtocolHelper.getCommandFailureException;
 import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk;
-import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION;
+import static com.mongodb.internal.operation.ServerVersionHelper.LATEST_WIRE_VERSION;
 
 class TestInternalConnection implements InternalConnection {
 
@@ -66,7 +66,7 @@ private static class Interaction {
     }
 
     TestInternalConnection(final ServerId serverId, final ServerType serverType) {
-        this.description = new ConnectionDescription(new ConnectionId(serverId), THREE_DOT_SIX_WIRE_VERSION, serverType, 0, 0, 0,
+        this.description = new ConnectionDescription(new ConnectionId(serverId), LATEST_WIRE_VERSION, serverType, 0, 0, 0,
                 Collections.emptyList());
         this.bufferProvider = new SimpleBufferProvider();