Update to latest NIO2 changes

Author: Mordil

Sources/NIORedis/ChannelHandlers/RESPEncoder+MessageToByte.swift

@@ -6,6 +6,6 @@ extension RESPEncoder: MessageToByteEncoder {
 
     /// See `RESPEncoder.encode(ctx:data:out:)`
     public func encode(ctx: ChannelHandlerContext, data: RESPValue, out: inout ByteBuffer) throws {
-        out.write(bytes: encode(data))
+        out.writeBytes(encode(data))
     }
 }

Sources/NIORedis/RedisPipeline.swift

@@ -63,7 +63,7 @@ public final class RedisPipeline {
         return EventLoopFuture<[RESPValue]>.reduce(
             into: [],
             queuedCommandResults,
-            eventLoop: channel.eventLoop,
+            on: channel.eventLoop,
             { (results, response) in results.append(response) }
         )
     }

Tests/NIORedisTests/ChannelHandlers/RESPDecoder+ByteToMessageDecoderTests.swift

@@ -60,8 +60,8 @@ final class RESPDecoderByteToMessageDecoderTests: XCTestCase {
         let handler = ByteToMessageHandler(decoder)
         try embeddedChannel.pipeline.add(handler: handler).wait()
         let context = try embeddedChannel.pipeline.context(handler: handler).wait()
-
-        buffer.write(string: input)
+        
+        buffer.writeString(input)
 
         return try decoder.decode(ctx: context, buffer: &buffer)
     }

Tests/NIORedisTests/ChannelHandlers/RESPDecoder+ParsingTests.swift

@@ -91,7 +91,7 @@ final class RESPDecoderParsingTests: XCTestCase {
 
     func testParsing_withInvalidSymbol_throws() {
         _ = runParse(offset: 0) { decoder, position, buffer in
-            buffer.write(string: "&3\r\n")
+            buffer.writeString("&3\r\n")
             do {
                 _ = try decoder.parse(at: &position, from: &buffer)
                 XCTFail("parse(at:from:) did not throw an expected error!")
@@ -106,7 +106,7 @@ final class RESPDecoderParsingTests: XCTestCase {
         let expectedContent = "ERR unknown command 'foobar'"
         let testString = "-\(expectedContent)\r\n"
         let result = runParse(offset: 0) { decoder, position, buffer in
-            buffer.write(string: testString)
+            buffer.writeString(testString)
             guard
                 case .parsed(let data) = try decoder.parse(at: &position, from: &buffer),
                 case .error = data
@@ -126,7 +126,7 @@ final class RESPDecoderParsingTests: XCTestCase {
     /// Takes a collection of bytes representing a complete message and returns the data
     private func parseTest_singleValue(input: Data) -> RESPValue? {
         return runParse(offset: 0) { decoder, position, buffer in
-            buffer.write(bytes: input)
+            buffer.writeBytes(input)
             guard case .parsed(let result)? = try? decoder.parse(at: &position, from: &buffer) else { return nil }
             return result
         }
@@ -145,7 +145,7 @@ final class RESPDecoderParsingTests: XCTestCase {
         var buffer = allocator.buffer(capacity: messageChunks.joined().count)
 
         for chunk in messageChunks {
-            buffer.write(bytes: chunk)
+            buffer.writeBytes(chunk)
         }
 
         var position = 0
@@ -186,7 +186,7 @@ extension RESPDecoderParsingTests {
     func testParsing_simpleString_handlesRecursion() throws {
         _ = runParse { decoder, position, buffer in
             let testString = "+OK\r\n+OTHER STRING\r\n"
-            buffer.write(string: testString)
+            buffer.writeString(testString)
 
             _ = try decoder._parseSimpleString(at: &position, from: &buffer)
 
@@ -203,7 +203,7 @@ extension RESPDecoderParsingTests {
 
     private func parseTestSimpleString(_ input: String) throws -> String? {
         return runParse { decoder, position, buffer in
-            buffer.write(string: input)
+            buffer.writeString(input)
             guard let string = try decoder._parseSimpleString(at: &position, from: &buffer) else { return nil }
             return .simpleString(string)
         }?.string
@@ -228,7 +228,7 @@ extension RESPDecoderParsingTests {
     func testParsing_integer_handlesRecursion() throws {
         _ = runParse { decoder, position, buffer in
             let testString = ":1\r\n:300\r\n"
-            buffer.write(string: testString)
+            buffer.writeString(testString)
 
             _ = try decoder._parseInteger(at: &position, from: &buffer)
 
@@ -245,7 +245,7 @@ extension RESPDecoderParsingTests {
 
     private func parseTestInteger(_ input: String) throws -> Int? {
         return runParse { decoder, position, buffer in
-            buffer.write(string: input)
+            buffer.writeString(input)
             guard let int = try decoder._parseInteger(at: &position, from: &buffer) else { return nil }
             return .integer(int)
         }?.int
@@ -291,7 +291,7 @@ extension RESPDecoderParsingTests {
 
     private func parseTestBulkString(_ input: Data) -> RESPValue? {
         return runParse { decoder, position, buffer in
-            buffer.write(bytes: input)
+            buffer.writeBytes(input)
             guard case .parsed(let result) = try decoder._parseBulkString(at: &position, from: &buffer) else {
                 return nil
             }
@@ -345,7 +345,7 @@ extension RESPDecoderParsingTests {
 
     private func parseTestArray(_ input: Data) -> RESPValue? {
         return runParse { decoder, position, buffer in
-            buffer.write(bytes: input)
+            buffer.writeBytes(input)
             guard case .parsed(let result) = try decoder._parseArray(at: &position, from: &buffer) else { return nil }
             return result
         }

Tests/NIORedisTests/ChannelHandlers/RESPDecoderTests.swift

@@ -112,7 +112,7 @@ final class RESPDecoderTests: XCTestCase {
         let handler = ByteToMessageHandler(decoder)
         try embeddedChannel.pipeline.add(handler: handler).wait()
         var buffer = allocator.buffer(capacity: 256)
-        buffer.write(bytes: input)
+        buffer.writeBytes(input)
         try embeddedChannel.writeInbound(buffer)
         return (embeddedChannel.readInbound(), embeddedChannel.readInbound())
     }
@@ -176,7 +176,7 @@ extension RESPDecoderTests {
 
         var buffer = allocator.buffer(capacity: 256)
         for message in AllData.messages {
-            buffer.write(string: message)
+            buffer.writeString(message)
         }
 
         try embeddedChannel.writeInbound(buffer)