SingleResultCallback moved to async

rozza · rozza · commit 793a65f758d7 · 2014-08-21T16:31:31.000+01:00
JAVA-1333
diff --git a/driver-async/src/main/com/mongodb/async/client/MappingIterable.java b/driver-async/src/main/com/mongodb/async/client/MappingIterable.java
@@ -20,7 +20,7 @@
 import com.mongodb.Function;
 import com.mongodb.MongoException;
 import com.mongodb.async.MongoFuture;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.SingleResultFuture;
 
 import java.util.Collection;
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java
@@ -24,7 +24,7 @@
 import com.mongodb.binding.AsyncReadWriteBinding;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.connection.Cluster;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.operation.AsyncReadOperation;
 import com.mongodb.operation.AsyncWriteOperation;
 import com.mongodb.async.SingleResultFuture;
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java
@@ -25,7 +25,7 @@
 import com.mongodb.async.MongoFuture;
 import com.mongodb.codecs.CollectibleCodec;
 import com.mongodb.codecs.DocumentCodec;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.operation.AsyncReadOperation;
 import com.mongodb.operation.AsyncWriteOperation;
 import com.mongodb.operation.CountOperation;
diff --git a/driver-core/src/main/com/mongodb/async/MongoFuture.java b/driver-core/src/main/com/mongodb/async/MongoFuture.java
@@ -16,8 +16,6 @@
 
 package com.mongodb.async;
 
-import com.mongodb.connection.SingleResultCallback;
-
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
diff --git a/driver-core/src/main/com/mongodb/async/SingleResultCallback.java b/driver-core/src/main/com/mongodb/async/SingleResultCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.async;
 
 import com.mongodb.MongoException;
 
diff --git a/driver-core/src/main/com/mongodb/async/SingleResultFuture.java b/driver-core/src/main/com/mongodb/async/SingleResultFuture.java
@@ -19,7 +19,6 @@
 import com.mongodb.MongoException;
 import com.mongodb.MongoInterruptedException;
 import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.connection.SingleResultCallback;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/driver-core/src/main/com/mongodb/connection/Connection.java b/driver-core/src/main/com/mongodb/connection/Connection.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.ServerAddress;
 import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.ReferenceCounted;
 import org.bson.ByteBuf;
 
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionInitializer.java b/driver-core/src/main/com/mongodb/connection/ConnectionInitializer.java
@@ -16,6 +16,8 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.async.SingleResultCallback;
+
 interface ConnectionInitializer {
 
     /**
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java
@@ -21,6 +21,7 @@
 import com.mongodb.MongoSocketReadTimeoutException;
 import com.mongodb.MongoWaitQueueFullException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.event.ConnectionEvent;
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultServer.java b/driver-core/src/main/com/mongodb/connection/DefaultServer.java
@@ -19,6 +19,7 @@
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 
 import java.util.Collections;
diff --git a/driver-core/src/main/com/mongodb/connection/InternalConnection.java b/driver-core/src/main/com/mongodb/connection/InternalConnection.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.ServerAddress;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 
 import java.util.List;
diff --git a/driver-core/src/main/com/mongodb/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/connection/InternalStreamConnection.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.MongoException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.event.ConnectionEvent;
diff --git a/driver-core/src/main/com/mongodb/connection/PipelinedConnectionInitializer.java b/driver-core/src/main/com/mongodb/connection/PipelinedConnectionInitializer.java
@@ -19,6 +19,7 @@
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.event.ConnectionEvent;
diff --git a/driver-core/src/main/com/mongodb/connection/StreamPipeline.java b/driver-core/src/main/com/mongodb/connection/StreamPipeline.java
@@ -24,6 +24,7 @@
 import com.mongodb.MongoSocketReadTimeoutException;
 import com.mongodb.MongoSocketWriteException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.event.ConnectionEvent;
diff --git a/driver-core/src/main/com/mongodb/connection/UsageTrackingInternalConnection.java b/driver-core/src/main/com/mongodb/connection/UsageTrackingInternalConnection.java
@@ -17,6 +17,7 @@
 package com.mongodb.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 
 import java.util.List;
diff --git a/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java b/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java
@@ -25,7 +25,7 @@
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.AcknowledgedWriteResult;
 import com.mongodb.protocol.WriteCommandProtocol;
 import com.mongodb.protocol.WriteProtocol;
diff --git a/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java b/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java
@@ -31,7 +31,7 @@
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerDescription;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.CommandProtocol;
 import com.mongodb.protocol.Protocol;
 import com.mongodb.protocol.message.NoOpFieldNameValidator;
diff --git a/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java b/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java
@@ -25,7 +25,7 @@
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.InsertProtocol;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
diff --git a/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java b/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java
@@ -29,7 +29,7 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.ServerVersion;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.AcknowledgedBulkWriteResult;
 import com.mongodb.protocol.BulkWriteBatchCombiner;
 import com.mongodb.protocol.DeleteCommandProtocol;
diff --git a/driver-core/src/main/com/mongodb/operation/MongoAsyncQueryCursor.java b/driver-core/src/main/com/mongodb/operation/MongoAsyncQueryCursor.java
@@ -26,7 +26,7 @@
 import com.mongodb.async.SingleResultFuture;
 import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.protocol.GetMoreDiscardProtocol;
diff --git a/driver-core/src/main/com/mongodb/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/operation/OperationHelper.java
@@ -28,7 +28,7 @@
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerVersion;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.Protocol;
 
 import java.util.Arrays;
diff --git a/driver-core/src/main/com/mongodb/operation/QueryOperation.java b/driver-core/src/main/com/mongodb/operation/QueryOperation.java
@@ -29,7 +29,7 @@
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerDescription;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.QueryProtocol;
 import com.mongodb.protocol.QueryResult;
 import org.bson.BsonBoolean;
diff --git a/driver-core/src/main/com/mongodb/operation/QueryOperationHelper.java b/driver-core/src/main/com/mongodb/operation/QueryOperationHelper.java
@@ -28,7 +28,7 @@
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.protocol.QueryProtocol;
 import com.mongodb.protocol.QueryResult;
 import org.bson.BsonDocument;
diff --git a/driver-core/src/main/com/mongodb/operation/SingleResultFutureCallback.java b/driver-core/src/main/com/mongodb/operation/SingleResultFutureCallback.java
@@ -18,7 +18,7 @@
 
 import com.mongodb.MongoException;
 import com.mongodb.async.SingleResultFuture;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 
 // TODO: should this be public?
 public class SingleResultFutureCallback<T> implements SingleResultCallback<T> {
diff --git a/driver-core/src/main/com/mongodb/protocol/CommandResultCallback.java b/driver-core/src/main/com/mongodb/protocol/CommandResultCallback.java
@@ -18,7 +18,7 @@
 
 import com.mongodb.MongoException;
 import com.mongodb.ServerAddress;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import org.bson.BsonDocument;
diff --git a/driver-core/src/main/com/mongodb/protocol/DeleteCommandProtocol.java b/driver-core/src/main/com/mongodb/protocol/DeleteCommandProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.RemoveRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/DeleteProtocol.java b/driver-core/src/main/com/mongodb/protocol/DeleteProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.RemoveRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/GetMoreDiscardProtocol.java b/driver-core/src/main/com/mongodb/protocol/GetMoreDiscardProtocol.java
@@ -20,7 +20,7 @@
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.SingleResultFuture;
 
 public class GetMoreDiscardProtocol implements Protocol<Void> {
diff --git a/driver-core/src/main/com/mongodb/protocol/GetMoreResultCallback.java b/driver-core/src/main/com/mongodb/protocol/GetMoreResultCallback.java
@@ -21,7 +21,7 @@
 import com.mongodb.MongoInternalException;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.protocol.message.ReplyMessage;
diff --git a/driver-core/src/main/com/mongodb/protocol/InsertCommandProtocol.java b/driver-core/src/main/com/mongodb/protocol/InsertCommandProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.InsertRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/InsertProtocol.java b/driver-core/src/main/com/mongodb/protocol/InsertProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.InsertRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/KillCursorProtocol.java b/driver-core/src/main/com/mongodb/protocol/KillCursorProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.ByteBufferOutputBuffer;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.async.SingleResultFuture;
diff --git a/driver-core/src/main/com/mongodb/protocol/QueryResultCallback.java b/driver-core/src/main/com/mongodb/protocol/QueryResultCallback.java
@@ -21,7 +21,7 @@
 import com.mongodb.ServerAddress;
 import com.mongodb.codecs.DocumentCodec;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.protocol.message.ReplyMessage;
diff --git a/driver-core/src/main/com/mongodb/protocol/ReplaceCommandProtocol.java b/driver-core/src/main/com/mongodb/protocol/ReplaceCommandProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.ReplaceRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/ReplaceProtocol.java b/driver-core/src/main/com/mongodb/protocol/ReplaceProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.operation.ReplaceRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/ResponseCallback.java b/driver-core/src/main/com/mongodb/protocol/ResponseCallback.java
@@ -20,7 +20,7 @@
 import com.mongodb.MongoInternalException;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 
 abstract class ResponseCallback implements SingleResultCallback<ResponseBuffers> {
     private volatile boolean closed;
diff --git a/driver-core/src/main/com/mongodb/protocol/SendMessageCallback.java b/driver-core/src/main/com/mongodb/protocol/SendMessageCallback.java
@@ -19,7 +19,7 @@
 import com.mongodb.MongoException;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.SingleResultFuture;
 import org.bson.io.OutputBuffer;
 
diff --git a/driver-core/src/main/com/mongodb/protocol/UnacknowledgedWriteResultCallback.java b/driver-core/src/main/com/mongodb/protocol/UnacknowledgedWriteResultCallback.java
@@ -20,7 +20,7 @@
 import com.mongodb.MongoNamespace;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.SingleResultFuture;
 import com.mongodb.operation.SingleResultFutureCallback;
 import com.mongodb.protocol.message.RequestMessage;
diff --git a/driver-core/src/main/com/mongodb/protocol/UpdateCommandProtocol.java b/driver-core/src/main/com/mongodb/protocol/UpdateCommandProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.async.SingleResultFuture;
 import com.mongodb.operation.UpdateRequest;
diff --git a/driver-core/src/main/com/mongodb/protocol/UpdateProtocol.java b/driver-core/src/main/com/mongodb/protocol/UpdateProtocol.java
@@ -21,7 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.async.MongoFuture;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.diagnostics.Loggers;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.async.SingleResultFuture;
diff --git a/driver-core/src/main/com/mongodb/protocol/WriteCommandProtocol.java b/driver-core/src/main/com/mongodb/protocol/WriteCommandProtocol.java
@@ -23,7 +23,7 @@
 import com.mongodb.connection.ByteBufferOutputBuffer;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ResponseBuffers;
-import com.mongodb.connection.SingleResultCallback;
+import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.SingleResultFuture;
 import com.mongodb.operation.SingleResultFutureCallback;
 import com.mongodb.operation.WriteRequest;
diff --git a/driver-core/src/test/functional/com/mongodb/connection/InternalStreamConnectionSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/InternalStreamConnectionSpecification.groovy
@@ -23,6 +23,7 @@ import com.mongodb.MongoNamespace
 import com.mongodb.MongoSocketClosedException
 import com.mongodb.MongoSocketReadException
 import com.mongodb.MongoSocketWriteException
+import com.mongodb.async.SingleResultCallback
 import com.mongodb.codecs.DocumentCodec
 import com.mongodb.event.ConnectionListener
 import com.mongodb.operation.QueryFlag
diff --git a/driver-core/src/test/unit/com/mongodb/async/SingleResultFutureTest.java b/driver-core/src/test/unit/com/mongodb/async/SingleResultFutureTest.java
@@ -17,7 +17,6 @@
 package com.mongodb.async;
 
 import com.mongodb.MongoException;
-import com.mongodb.connection.SingleResultCallback;
 import org.junit.Test;
 
 import java.util.concurrent.CancellationException;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestConnectionPool.java b/driver-core/src/test/unit/com/mongodb/connection/TestConnectionPool.java
@@ -17,6 +17,7 @@
 package com.mongodb.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 
 import java.util.List;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnection.java b/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnection.java
@@ -18,6 +18,7 @@
 
 import com.mongodb.MongoException;
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 import org.bson.ByteBufNIO;
 import org.bson.io.BasicInputBuffer;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnectionFactory.java b/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnectionFactory.java
@@ -17,6 +17,7 @@
 package com.mongodb.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.ByteBuf;
 
 import java.util.ArrayList;
diff --git a/driver-rx/src/main/com/mongodb/async/rx/client/MongoCollectionImpl.java b/driver-rx/src/main/com/mongodb/async/rx/client/MongoCollectionImpl.java
diff --git a/driver-rx/src/main/com/mongodb/async/rx/client/OnSubscribeAdapter.java b/driver-rx/src/main/com/mongodb/async/rx/client/OnSubscribeAdapter.java
