Fix findOne support in JsonPoweredCrudTestHelper classes

Author: jyemin

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

@@ -474,12 +474,19 @@ BsonDocument getDistinctResult(final BsonDocument collectionOptions, final BsonD
     @SuppressWarnings("deprecation")
     BsonDocument getFindOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
                                   @Nullable final ClientSession clientSession) {
-        return getFindResult(collectionOptions, arguments, clientSession);
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+        createFindIterable(collectionOptions, arguments, clientSession).first(futureResultCallback);
+        return toResult(futureResult(futureResultCallback));
     }
 
     @SuppressWarnings("deprecation")
     BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocument arguments,
                                @Nullable final ClientSession clientSession) {
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession));
+    }
+
+    private FindIterable<BsonDocument> createFindIterable(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                          @Nullable final ClientSession clientSession) {
         FindIterable<BsonDocument> iterable;
         if (clientSession == null) {
             iterable = getCollection(collectionOptions).find(arguments.getDocument("filter", new BsonDocument()));
@@ -505,7 +512,7 @@ BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocum
         if (arguments.containsKey("collation")) {
             iterable.collation(getCollation(arguments.getDocument("collation")));
         }
-        return toResult(iterable);
+        return iterable;
     }
 
     BsonDocument getMapReduceResult(final BsonDocument collectionOptions, final BsonDocument arguments,

driver-sync/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java

@@ -449,12 +449,17 @@ BsonDocument getDistinctResult(final BsonDocument collectionOptions, final BsonD
     @SuppressWarnings("deprecation")
     BsonDocument getFindOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
                                   @Nullable final ClientSession clientSession) {
-        return getFindResult(collectionOptions, arguments, clientSession);
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession).first());
     }
 
     @SuppressWarnings("deprecation")
     BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocument arguments,
                                @Nullable final ClientSession clientSession) {
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession));
+    }
+
+    private FindIterable<BsonDocument> createFindIterable(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                          @Nullable final ClientSession clientSession) {
         FindIterable<BsonDocument> iterable;
         if (clientSession == null) {
             iterable = getCollection(collectionOptions).find(arguments.getDocument("filter", new BsonDocument()));
@@ -480,7 +485,7 @@ BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocum
         if (arguments.containsKey("collation")) {
             iterable.collation(getCollation(arguments.getDocument("collation")));
         }
-        return toResult(iterable);
+        return iterable;
     }
 
     BsonDocument getMapReduceResult(final BsonDocument collectionOptions, final BsonDocument arguments,