Updated CommandOperationHelper so bindings must be provided

Ensures that readpreferences cannot accidentily default to primary()

Refs: JAVA-1954

Author: rozza

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

@@ -80,12 +80,12 @@ public AggregateExplainOperation maxTime(final long maxTime, final TimeUnit time
 
     @Override
     public BsonDocument execute(final ReadBinding binding) {
-        return executeWrappedCommandProtocol(namespace.getDatabaseName(), getCommand(), binding);
+        return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand());
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<BsonDocument> callback) {
-        executeWrappedCommandProtocolAsync(namespace.getDatabaseName(), getCommand(), binding, callback);
+        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), callback);
     }
 
     private BsonDocument getCommand() {

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

@@ -196,11 +196,9 @@ public BatchCursor<T> execute(final ReadBinding binding) {
         return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
             @Override
             public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
-                return executeWrappedCommandProtocol(namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                                                     CommandResultDocumentCodec.create(decoder,
-                                                                                       getFieldNameWithResults(connection
-                                                                                                               .getDescription())),
-                                                     connection, binding.getReadPreference(), transformer(source, connection));
+                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
+                        CommandResultDocumentCodec.create(decoder, getFieldNameWithResults(connection.getDescription())),
+                        connection, transformer(source, connection));
             }
         });
     }
@@ -213,12 +211,11 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
                 if (t != null) {
                     errorHandlingCallback(callback).onResult(null, t);
                 } else {
-                    executeWrappedCommandProtocolAsync(namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                                                       CommandResultDocumentCodec.create(decoder,
-                                                                                         getFieldNameWithResults(connection
-                                                                                                                 .getDescription())),
-                                                       connection, binding.getReadPreference(), asyncTransformer(source, connection),
-                                                       releasingCallback(errorHandlingCallback(callback), source, connection));
+                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(),
+                            asCommandDocument(connection.getDescription()),
+                            CommandResultDocumentCodec.create(decoder, getFieldNameWithResults(connection.getDescription())),
+                            connection, asyncTransformer(source, connection),
+                            releasingCallback(errorHandlingCallback(callback), source, connection));
                 }
             }
         });

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

@@ -127,15 +127,15 @@ public AggregateToCollectionOperation maxTime(final long maxTime, final TimeUnit
     @SuppressWarnings("unchecked")
     @Override
     public Void execute(final WriteBinding binding) {
-        executeWrappedCommandProtocol(namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(), binding,
+        executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(),
                                       new VoidTransformer<BsonDocument>());
 
         return null;
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(), binding,
+        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(),
                                            new VoidTransformer<BsonDocument>(), callback);
     }