update to latest NIO2

Author: Mordil

Sources/NIORedis/ChannelHandlers/RedisCommandHandler.swift

@@ -38,7 +38,7 @@ extension RedisCommandHandler: ChannelInboundHandler {
         guard let leadPromise = commandResponseQueue.last else {
             return assertionFailure("Received unexpected error while idle: \(error.localizedDescription)")
         }
-        leadPromise.fail(error: error)
+        leadPromise.fail(error)
     }
 
     /// Invoked by NIO when a read has been fired from earlier in the response chain. This forwards the unwrapped
@@ -56,8 +56,8 @@ extension RedisCommandHandler: ChannelInboundHandler {
         assert(popped != nil)
 
         switch value {
-        case .error(let e): leadPromise.fail(error: e)
-        default: leadPromise.succeed(result: value)
+        case .error(let e): leadPromise.fail(e)
+        default: leadPromise.succeed(value)
         }
     }
 }

Sources/NIORedis/Commands/BasicCommands.swift

@@ -26,7 +26,7 @@ extension RedisConnection {
     public func delete(_ keys: String...) -> EventLoopFuture<Int> {
         let keyArgs = keys.map { RESPValue(bulk: $0) }
         return command("DEL", arguments: keyArgs)
-            .thenThrowing { res in
+            .flatMapThrowing { res in
                 guard let count = res.int else {
                     throw RedisError(identifier: "delete", reason: "Unexpected response: \(res)")
                 }
@@ -43,7 +43,7 @@ extension RedisConnection {
     /// - Returns: A future bool indicating if the expiration was set or not.
     public func expire(_ key: String, after deadline: Int) -> EventLoopFuture<Bool> {
         return command("EXPIRE", arguments: [RESPValue(bulk: key), RESPValue(bulk: deadline.description)])
-            .thenThrowing { res in
+            .flatMapThrowing { res in
                 guard let value = res.int else {
                     throw RedisError(identifier: "expire", reason: "Unexpected response: \(res)")
                 }

Sources/NIORedis/Extensions/NIO/ClientBootstrap.swift

@@ -17,10 +17,7 @@ extension ClientBootstrap {
                     ByteToMessageHandler(RESPDecoder()),
                     RedisCommandHandler()
                 ]
-                return EventLoopFuture<Void>.andAll(
-                    handlers.map { channel.pipeline.add(handler: $0) },
-                    eventLoop: group.next()
-                )
+                return .andAllSucceed(handlers.map { channel.pipeline.add(handler: $0) }, on: group.next())
             }
     }
 }

Sources/NIORedis/RedisConnection.swift

@@ -28,7 +28,7 @@ public final class RedisConnection {
     /// - Returns: An `EventLoopFuture` that resolves when the connection has been closed.
     @discardableResult
     public func close() -> EventLoopFuture<Void> {
-        guard _isClosed.exchange(with: true) else { return channel.eventLoop.makeSucceededFuture(result: ()) }
+        guard _isClosed.exchange(with: true) else { return channel.eventLoop.makeSucceededFuture(()) }
 
         let promise = channel.eventLoop.makePromise(of: Void.self)
 
@@ -55,7 +55,7 @@ public final class RedisConnection {
     /// - Returns: An `EventLoopFuture` that will resolve with the Redis command response.
     public func command(_ command: String, arguments: [RESPValue] = []) -> EventLoopFuture<RESPValue> {
         guard !_isClosed.load() else {
-            return channel.eventLoop.makeFailedFuture(error: RedisError.connectionClosed)
+            return channel.eventLoop.makeFailedFuture(RedisError.connectionClosed)
         }
 
         let promise = channel.eventLoop.makePromise(of: RESPValue.self)

Sources/NIORedis/RedisDriver.swift

@@ -56,9 +56,9 @@ public final class RedisDriver {
 
         return bootstrap.connect(host: hostname, port: port)
             .map { return RedisConnection(channel: $0) }
-            .then { connection in
+            .flatMap { connection in
                 guard let pw = password else {
-                    return self.eventLoopGroup.next().makeSucceededFuture(result: connection)
+                    return self.eventLoopGroup.next().makeSucceededFuture(connection)
                 }
 
                 return connection.authorize(with: pw).map { _ in return connection }
@@ -68,6 +68,6 @@ public final class RedisDriver {
 
 private extension ChannelPipeline {
     func addHandlers(_ handlers: ChannelHandler...) -> EventLoopFuture<Void> {
-        return EventLoopFuture<Void>.andAll(handlers.map { add(handler: $0) }, eventLoop: eventLoop)
+        return .andAllSucceed(handlers.map { add(handler: $0) }, on: eventLoop)
     }
 }

Tests/NIORedisTests/RedisDriverTests.swift

@@ -18,7 +18,7 @@ final class RedisDriverTests: XCTestCase {
 
     override func tearDown() {
         _ = connection.command("FLUSHALL")
-            .then { _ in self.connection.close() }
+            .flatMap { _ in self.connection.close() }
             .map { _ in try? self.driver.terminate() }
     }