PR updates

Author: rozza

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

@@ -17,34 +17,11 @@
 package com.mongodb.internal.operation;
 
 import com.mongodb.internal.async.AsyncBatchCursor;
-import com.mongodb.internal.async.SingleResultCallback;
-import com.mongodb.internal.binding.AsyncReadBinding;
-import com.mongodb.internal.binding.ReadBinding;
 
 /**
  * An operation that reads from a MongoDB server and returns a cursor.
  *
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
 public interface ReadOperationCursor<T> extends ReadOperation<BatchCursor<T>, AsyncBatchCursor<T>> {
-
-    /**
-     * General execute which can return anything of type T
-     *
-     * @param binding the binding to execute in the context of
-     * @return T, the result of the execution
-     */
-    default BatchCursor<T> execute(ReadBinding binding) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    /**
-     * General execute which can return anything of type R
-     *
-     * @param binding the binding to execute in the context of
-     * @param callback the callback to be called when the operation has been executed
-     */
-    default void executeAsync(AsyncReadBinding binding, SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
 }

driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java

@@ -113,7 +113,7 @@ public WriteConcernResult execute(final WriteBinding binding) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<WriteConcernResult> callback) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException("This operation is sync only");
     }
 
     private MongoException convertBulkWriteException(final MongoBulkWriteException e) {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java

@@ -224,7 +224,7 @@ private ReadOperationCursor<T> createFindOperation(final int initialBatchSize) {
     }
 
     // this could be inlined, but giving it a name so that it's unit-testable
-    static class WrappedMapReduceReadOperation<T> implements ReadOperationCursor<T> {
+    static class WrappedMapReduceReadOperation<T> implements ReadOperationCursorAsyncOnly<T> {
         private final ReadOperation<MapReduceBatchCursor<T>, MapReduceAsyncBatchCursor<T>> operation;
 
         WrappedMapReduceReadOperation(final ReadOperation<MapReduceBatchCursor<T>, MapReduceAsyncBatchCursor<T>> operation) {
@@ -259,7 +259,7 @@ WriteOperation<MapReduceStatistics> getOperation() {
 
         @Override
         public String getCommandName() {
-            return "mapReduce";
+            return operation.getCommandName();
         }
 
         @Override

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ReadOperationCursorAsyncOnly.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.reactivestreams.client.internal;
+
+import com.mongodb.internal.binding.ReadBinding;
+import com.mongodb.internal.operation.BatchCursor;
+import com.mongodb.internal.operation.ReadOperationCursor;
+
+public interface ReadOperationCursorAsyncOnly<T> extends ReadOperationCursor<T> {
+
+    default BatchCursor<T> execute(final ReadBinding binding) {
+        throw new UnsupportedOperationException("This operation is async only");
+    }
+
+}

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidReadOperationThenCursorReadOperation.java

@@ -22,7 +22,7 @@
 import com.mongodb.internal.operation.ReadOperationCursor;
 import com.mongodb.internal.operation.ReadOperationSimple;
 
-class VoidReadOperationThenCursorReadOperation<T> implements ReadOperationCursor<T> {
+class VoidReadOperationThenCursorReadOperation<T> implements ReadOperationCursorAsyncOnly<T> {
     private final ReadOperationSimple<Void> readOperation;
     private final ReadOperationCursor<T> cursorReadOperation;
 

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/VoidWriteOperationThenCursorReadOperation.java

@@ -23,7 +23,7 @@
 import com.mongodb.internal.operation.ReadOperationCursor;
 import com.mongodb.internal.operation.WriteOperation;
 
-class VoidWriteOperationThenCursorReadOperation<T> implements ReadOperationCursor<T> {
+class VoidWriteOperationThenCursorReadOperation<T> implements ReadOperationCursorAsyncOnly<T> {
     private final WriteOperation<Void> writeOperation;
     private final ReadOperationCursor<T> cursorReadOperation;
 

driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java

@@ -24,6 +24,9 @@
 import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.client.model.Collation;
 import com.mongodb.internal.TimeoutSettings;
+import com.mongodb.internal.async.AsyncBatchCursor;
+import com.mongodb.internal.async.SingleResultCallback;
+import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ReadBinding;
 import com.mongodb.internal.client.model.FindOptions;
 import com.mongodb.internal.operation.BatchCursor;
@@ -241,5 +244,10 @@ public String getCommandName() {
         public BatchCursor<TResult> execute(final ReadBinding binding) {
             return operation.execute(binding);
         }
+
+        @Override
+        public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
+            throw new UnsupportedOperationException("This operation is sync only");
+        }
     }
 }