Remove OperationExecutor protocol and executeOperationAsync helper (#390)

Author: kmahar

Sources/MongoSwift/MongoClient.swift

@@ -255,7 +255,7 @@ public class MongoClient {
 
         let connString = try ConnectionString(connectionString, options: options)
         self.connectionPool = try ConnectionPool(from: connString, options: options?.tlsOptions)
-        self.operationExecutor = DefaultOperationExecutor(
+        self.operationExecutor = OperationExecutor(
             eventLoopGroup: eventLoopGroup,
             threadPoolSize: options?.threadPoolSize ?? MongoClient.defaultThreadPoolSize
         )
@@ -350,7 +350,7 @@ public class MongoClient {
         session: ClientSession? = nil
     ) -> EventLoopFuture<[DatabaseSpecification]> {
         let operation = ListDatabasesOperation(client: self, filter: filter, nameOnly: nil)
-        return self.executeOperationAsync(operation, session: session).flatMapThrowing { result in
+        return self.operationExecutor.execute(operation, client: self, session: session).flatMapThrowing { result in
             guard case let .specs(dbs) = result else {
                 throw InternalError(message: "Invalid result")
             }
@@ -394,7 +394,7 @@ public class MongoClient {
         session: ClientSession? = nil
     ) -> EventLoopFuture<[String]> {
         let operation = ListDatabasesOperation(client: self, filter: filter, nameOnly: true)
-        return self.executeOperationAsync(operation, session: session).flatMapThrowing { result in
+        return self.operationExecutor.execute(operation, client: self, session: session).flatMapThrowing { result in
             guard case let .names(names) = result else {
                 throw InternalError(message: "Invalid result")
             }
@@ -542,15 +542,6 @@ public class MongoClient {
     ) throws -> T.OperationResult {
         return try self.operationExecutor.execute(operation, using: connection, client: self, session: session).wait()
     }
-
-    /// Executes an `Operation` asynchronously using this `MongoClient` and an optionally provided session.
-    internal func executeOperationAsync<T: Operation>(
-        _ operation: T,
-        using connection: Connection? = nil,
-        session: ClientSession? = nil
-    ) -> EventLoopFuture<T.OperationResult> {
-        return self.operationExecutor.execute(operation, using: connection, client: self, session: session)
-    }
 }
 
 extension MongoClient: Equatable {

Sources/MongoSwift/MongoCollection+BulkWrite.swift

@@ -31,7 +31,7 @@ extension MongoCollection {
                 .makeFailedFuture(InvalidArgumentError(message: "requests cannot be empty"))
         }
         let operation = BulkWriteOperation(collection: self, models: requests, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 }
 

Sources/MongoSwift/MongoCollection+FindAndModify.swift

@@ -110,7 +110,7 @@ extension MongoCollection {
         session: ClientSession?
     ) -> EventLoopFuture<CollectionType?> {
         let operation = FindAndModifyOperation(collection: self, filter: filter, update: update, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 }
 

Sources/MongoSwift/MongoCollection+Indexes.swift

@@ -244,7 +244,7 @@ extension MongoCollection {
                 .makeFailedFuture(InvalidArgumentError(message: "models cannot be empty"))
         }
         let operation = CreateIndexesOperation(collection: self, models: models, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**
@@ -357,7 +357,7 @@ extension MongoCollection {
         session: ClientSession?
     ) -> EventLoopFuture<DropIndexesResult> {
         let operation = DropIndexesOperation(collection: self, index: index, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**

Sources/MongoSwift/MongoCollection+Read.swift

@@ -94,7 +94,7 @@ extension MongoCollection {
         session: ClientSession? = nil
     ) -> EventLoopFuture<Int> {
         let operation = CountDocumentsOperation(collection: self, filter: filter, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**
@@ -111,7 +111,7 @@ extension MongoCollection {
         session: ClientSession? = nil
     ) -> EventLoopFuture<Int> {
         let operation = EstimatedDocumentCountOperation(collection: self, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**
@@ -138,6 +138,6 @@ extension MongoCollection {
         session: ClientSession? = nil
     ) -> EventLoopFuture<[BSON]> {
         let operation = DistinctOperation(collection: self, fieldName: fieldName, filter: filter, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 }

Sources/MongoSwift/MongoCollection.swift

@@ -95,7 +95,7 @@ public struct MongoCollection<T: Codable> {
      */
     public func drop(options: DropCollectionOptions? = nil, session: ClientSession? = nil) -> EventLoopFuture<Void> {
         let operation = DropCollectionOperation(collection: self, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /// Uses the provided `Connection` to get a pointer to a `mongoc_collection_t` corresponding to this

Sources/MongoSwift/MongoDatabase.swift

@@ -123,7 +123,7 @@ public struct MongoDatabase {
      */
     public func drop(options: DropDatabaseOptions? = nil, session: ClientSession? = nil) -> EventLoopFuture<Void> {
         let operation = DropDatabaseOperation(database: self, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**
@@ -214,7 +214,7 @@ public struct MongoDatabase {
         session: ClientSession? = nil
     ) -> EventLoopFuture<MongoCollection<T>> {
         let operation = CreateCollectionOperation(database: self, name: name, type: type, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**
@@ -288,12 +288,13 @@ public struct MongoDatabase {
         session: ClientSession? = nil
     ) -> EventLoopFuture<[String]> {
         let operation = ListCollectionsOperation(database: self, nameOnly: true, filter: filter, options: options)
-        return self._client.executeOperationAsync(operation, session: session).flatMapThrowing { result in
-            guard case let .names(names) = result else {
-                throw InternalError(message: "Invalid result")
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
+            .flatMapThrowing { result in
+                guard case let .names(names) = result else {
+                    throw InternalError(message: "Invalid result")
+                }
+                return names
             }
-            return names
-        }
     }
 
     /**
@@ -320,7 +321,7 @@ public struct MongoDatabase {
         session: ClientSession? = nil
     ) -> EventLoopFuture<Document> {
         let operation = RunCommandOperation(database: self, command: command, options: options)
-        return self._client.executeOperationAsync(operation, session: session)
+        return self._client.operationExecutor.execute(operation, client: self._client, session: session)
     }
 
     /**

Sources/MongoSwift/Operations/Operation.swift

@@ -11,25 +11,8 @@ internal protocol Operation {
     func execute(using connection: Connection, session: ClientSession?) throws -> OperationResult
 }
 
-/// A protocol for types that can be used to execute `Operation`s.
-internal protocol OperationExecutor {
-    /// Asynchronously executes an operation using the provided client and optionally provided session.
-    func execute<T: Operation>(
-        _ operation: T,
-        using connection: Connection?,
-        client: MongoClient,
-        session: ClientSession?
-    ) -> EventLoopFuture<T.OperationResult>
-    /// Asynchronously executes a block of code.
-    func execute<T>(body: @escaping () throws -> T) -> EventLoopFuture<T>
-    /// Closes the executor.
-    func close() -> EventLoopFuture<Void>
-    /// Makes a failed `EventLoopFuture` with the provided error.
-    func makeFailedFuture<T>(_ error: Error) -> EventLoopFuture<T>
-}
-
-/// Default executor type used by `MongoClient`s.
-internal class DefaultOperationExecutor: OperationExecutor {
+/// Operation executor used by `MongoClient`s.
+internal class OperationExecutor {
     /// A group of event loops to use for running operations in the thread pool.
     private let eventLoopGroup: EventLoopGroup
     /// The thread pool to execute operations in.
@@ -56,7 +39,7 @@ internal class DefaultOperationExecutor: OperationExecutor {
 
     internal func execute<T: Operation>(
         _ operation: T,
-        using connection: Connection?,
+        using connection: Connection? = nil,
         client: MongoClient,
         session: ClientSession?
     ) -> EventLoopFuture<T.OperationResult> {