Moved driver-core connection implementation into internal

Author: rozza

config/findbugs-exclude.xml

@@ -33,7 +33,7 @@
 
     <!-- Deliberately ignoring return value of CountDownLatch.await -->
     <Match>
-        <Class name="com.mongodb.connection.BaseCluster"/>
+        <Class name="com.mongodb.internal.connection.BaseCluster"/>
         <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
     </Match>
 
@@ -128,7 +128,7 @@
     </Match>
 
     <Match>
-        <Class name="~com.mongodb.connection.AbstractByteBufBsonDocument.*"/>
+        <Class name="~com.mongodb.internal.connection.AbstractByteBufBsonDocument.*"/>
         <Bug pattern="NP_BOOLEAN_RETURN_NULL"/>
     </Match>
 

driver-async/src/test/functional/com/mongodb/async/client/MongoClientSessionSpecification.groovy

@@ -25,7 +25,7 @@ import com.mongodb.TransactionOptions
 import com.mongodb.WriteConcern
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.connection.TestCommandListener
+import com.mongodb.internal.connection.TestCommandListener
 import com.mongodb.event.CommandStartedEvent
 import org.bson.BsonBinarySubType
 import org.bson.BsonDocument

driver-async/src/test/functional/com/mongodb/async/client/ReadConcernTest.java

@@ -20,7 +20,7 @@
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
-import com.mongodb.connection.TestCommandListener;
+import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.event.CommandEvent;
 import com.mongodb.event.CommandStartedEvent;
 import org.bson.BsonDocument;

driver-async/src/test/functional/com/mongodb/async/client/TransactionsTest.java

@@ -29,8 +29,8 @@
 import com.mongodb.client.model.CreateCollectionOptions;
 import com.mongodb.client.test.CollectionHelper;
 import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.TestCommandListener;
 import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;

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

@@ -17,6 +17,7 @@
 package com.mongodb.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.internal.connection.AsynchronousSocketChannelStream;
 import com.mongodb.internal.connection.PowerOfTwoBufferPool;
 
 import java.nio.channels.AsynchronousChannelGroup;

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

@@ -96,7 +96,14 @@ public ConnectionDescription(final ConnectionId connectionId, final ServerVersio
     }
 
 
-    ConnectionDescription withConnectionId(final ConnectionId connectionId) {
+    /**
+     * Creates a new connection description with the set connection id
+     *
+     * @param connectionId the connection id
+     * @return the new connection description
+     * @since 3.8
+     */
+    public ConnectionDescription withConnectionId(final ConnectionId connectionId) {
         notNull("connectionId", connectionId);
         return new ConnectionDescription(connectionId, serverVersion, serverType, maxBatchCount, maxDocumentSize, maxMessageSize,
                                                 compressors);

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

@@ -44,8 +44,9 @@ public final class ConnectionId {
      * Construct an instance with the given server id.
      *
      * @param serverId the server id
+     * @since 3.8
      */
-    ConnectionId(final ServerId serverId) {
+    public ConnectionId(final ServerId serverId) {
         this(serverId, INCREMENTING_ID.incrementAndGet(), null);
     }
 
@@ -60,7 +61,14 @@ private ConnectionId(final ServerId serverId, final int localValue, final Intege
         }
     }
 
-    ConnectionId withServerValue(final int serverValue) {
+    /**
+     * Creates a new connectionId with the set server value
+     *
+     * @param serverValue the server value
+     * @return the new connection id
+     * @since 3.8
+     */
+    public ConnectionId withServerValue(final int serverValue) {
         isTrue("server value is null", this.serverValue == null);
         return new ConnectionId(serverId, localValue, serverValue);
     }

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

@@ -22,6 +22,10 @@
 import com.mongodb.event.ClusterListener;
 import com.mongodb.event.CommandListener;
 import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.internal.connection.ClusterableServerFactory;
+import com.mongodb.internal.connection.DefaultClusterableServerFactory;
+import com.mongodb.internal.connection.MultiServerCluster;
+import com.mongodb.internal.connection.SingleServerCluster;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -49,18 +49,6 @@ public QueryResult(final MongoNamespace namespace, final List<T> results, final
         this.serverAddress = serverAddress;
     }
 
-    /**
-     * Construct an instance.
-     *
-     * @param namespace    the namespace
-     * @param replyMessage the reply message
-     * @param address      the server address
-     */
-    QueryResult(final MongoNamespace namespace, final ReplyMessage<T> replyMessage, final ServerAddress address) {
-        this(namespace, replyMessage.getDocuments(), replyMessage.getReplyHeader().getCursorId(), address
-            );
-    }
-
     /**
      * Gets the namespace.
      *

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

@@ -21,6 +21,8 @@
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
 import com.mongodb.lang.Nullable;
+import com.mongodb.internal.connection.DecimalFormatHelper;
+import com.mongodb.internal.connection.Time;
 import org.bson.types.ObjectId;
 
 import java.util.Collections;
@@ -45,9 +47,21 @@
 @Immutable
 public class ServerDescription {
 
-    static final String MIN_DRIVER_SERVER_VERSION = "2.6";
-    static final int MIN_DRIVER_WIRE_VERSION = 1;
-    static final int MAX_DRIVER_WIRE_VERSION = 6;
+    /**
+     * The minimum supported driver server version
+     * @since 3.8
+     */
+    public static final String MIN_DRIVER_SERVER_VERSION = "2.6";
+    /**
+     * The minimum supported driver wire version
+     * @since 3.8
+     */
+    public static final int MIN_DRIVER_WIRE_VERSION = 1;
+    /**
+     * The maximum supported driver wire version
+     * @since 3.8
+     */
+    public static final int MAX_DRIVER_WIRE_VERSION = 6;
 
     private static final int DEFAULT_MAX_DOCUMENT_SIZE = 0x1000000;  // 16MB