Refactorings to clean up a few warnings.

Author: jyemin

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

@@ -77,7 +77,7 @@ static <T> QueryBatchCursor<T> createEmptyBatchCursor(final MongoNamespace names
                                                           final ServerAddress serverAddress, final int batchSize) {
         return new QueryBatchCursor<T>(new QueryResult<T>(namespace, Collections.<T>emptyList(), 0L,
                                                           serverAddress),
-                                       0, batchSize, decoder, serverAddress);
+                                       0, batchSize, decoder);
     }
 
     static <T> AsyncBatchCursor<T> createEmptyAsyncBatchCursor(final MongoNamespace namespace, final Decoder<T> decoder,
@@ -225,7 +225,7 @@ public void onResult(final AsyncConnectionSource source, final Throwable t) {
         }
     }
 
-    private static <T> void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnection callable) {
+    private static void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnection callable) {
         source.getConnection(new SingleResultCallback<AsyncConnection>() {
             @Override
             public void onResult(final AsyncConnection connection, final Throwable t) {
@@ -239,7 +239,7 @@ public void onResult(final AsyncConnection connection, final Throwable t) {
         });
     }
 
-    private static <T> void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnectionAndSource callable) {
+    private static void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnectionAndSource callable) {
         source.getConnection(new SingleResultCallback<AsyncConnection>() {
             @Override
             public void onResult(final AsyncConnection result, final Throwable t) {

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

@@ -29,12 +29,11 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.operation.CursorHelper.getNumberToReturn;
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 class QueryBatchCursor<T> implements BatchCursor<T> {
     private final MongoNamespace namespace;
     private final int limit;
-    private final ServerAddress serverAddress;
     private final Decoder<T> decoder;
     private final ConnectionSource connectionSource;
     private int batchSize;
@@ -44,23 +43,16 @@ class QueryBatchCursor<T> implements BatchCursor<T> {
     private int count;
     private boolean closed;
 
-    QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize,
-                     final Decoder<T> decoder, final ServerAddress serverAddress) {
-        this(firstQueryResult, limit, batchSize, decoder, (ConnectionSource) null, serverAddress);
+    QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize, final Decoder<T> decoder) {
+        this(firstQueryResult, limit, batchSize, decoder, (ConnectionSource) null);
     }
 
     QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize,
                      final Decoder<T> decoder, final ConnectionSource connectionSource) {
-        this(firstQueryResult, limit, batchSize, decoder, connectionSource, connectionSource.getServerDescription().getAddress());
-    }
-
-    QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize,
-                     final Decoder<T> decoder, final ConnectionSource connectionSource, final ServerAddress serverAddress) {
         this.namespace = firstQueryResult.getNamespace();
         this.limit = limit;
         this.batchSize = batchSize;
         this.decoder = notNull("decoder", decoder);
-        this.serverAddress = notNull("serverAddress", serverAddress);
         if (firstQueryResult.getCursor() != null) {
             notNull("connectionSource", connectionSource);
         }
@@ -230,7 +222,7 @@ private void killCursor() {
 
     private void killCursor(final Connection connection) {
         if (serverCursor != null && !killed) {
-            connection.killCursor(asList(serverCursor.getId()));
+            connection.killCursor(singletonList(serverCursor.getId()));
             killed = true;
         }
     }