Merge pull request #30 from Mordil/29-replace-data

Replace `Foundation.Data` with `[UInt8]` type everywhere

Author: Mordil

Sources/NIORedis/ChannelHandlers/RedisCommandHandler.swift

@@ -1,4 +1,4 @@
-import Foundation
+import struct Foundation.UUID
 import Logging
 import NIO
 

Sources/NIORedis/Commands/BasicCommands.swift

@@ -1,4 +1,3 @@
-import Foundation
 import NIO
 
 extension RedisClient {

Sources/NIORedis/Commands/SetCommands.swift

@@ -1,4 +1,3 @@
-import Foundation
 import NIO
 
 // MARK: General

Sources/NIORedis/Extensions/NIO/ClientBootstrap.swift

@@ -1,4 +1,3 @@
-import Foundation
 import NIO
 
 extension ClientBootstrap {

Sources/NIORedis/RESP/RESPDecoder.swift

@@ -1,4 +1,3 @@
-import Foundation
 import NIO
 
 extension UInt8 {
@@ -143,7 +142,7 @@ extension RESPDecoder {
         guard size > 0 else {
             // Move the tip of the message position
             position += 2
-            return .parsed(.bulkString(Data()))
+            return .parsed(.bulkString([]))
         }
 
         guard let bytes = buffer.copyBytes(at: position, length: expectedRemainingMessageSize) else {
@@ -154,9 +153,9 @@ extension RESPDecoder {
         // of the bulk string content
         position += expectedRemainingMessageSize
 
-        return .parsed(
-            .bulkString(Data(bytes[ ..<size ]))
-        )
+        return .parsed(.bulkString(
+            .init(bytes[..<size])
+        ))
     }
 
     /// See [https://redis.io/topics/protocol#resp-arrays](https://redis.io/topics/protocol#resp-arrays)

Sources/NIORedis/RESP/RESPValue.swift

@@ -1,26 +1,26 @@
-import Foundation
-
 /// A representation of a Redis Serialization Protocol (RESP) primitive value.
 ///
 /// See: [https://redis.io/topics/protocol](https://redis.io/topics/protocol)
 public enum RESPValue {
     case null
     case simpleString(String)
-    case bulkString(Data)
+    case bulkString([UInt8])
     case error(RedisError)
     case integer(Int)
     case array([RESPValue])
 
     /// Initializes a `bulkString` by converting the provided string input.
     public init(bulk: String) {
-        self = .bulkString(Data(bulk.utf8))
+        let bytes = [UInt8](bulk.utf8)
+        self = .bulkString(bytes)
     }
 }
 
 extension RESPValue: ExpressibleByStringLiteral {
     /// Initializes a bulk string from a String literal
     public init(stringLiteral value: String) {
-        self = .bulkString(Data(value.utf8))
+        let bytes = [UInt8](value.utf8)
+        self = .bulkString(bytes)
     }
 }
 
@@ -51,15 +51,15 @@ extension RESPValue {
     public var string: String? {
         switch self {
         case .simpleString(let string): return string
-        case .bulkString(let data): return String(bytes: data, encoding: .utf8)
+        case .bulkString(let bytes): return String(bytes: bytes, encoding: .utf8)
         default: return nil
         }
     }
 
-    /// Extracted binary data from `bulkString` representations.
-    public var data: Data? {
-        guard case .bulkString(let data) = self else { return nil }
-        return data
+    /// Extracted byte representation from `bulkString` values.
+    public var bytes: [UInt8]? {
+        guard case let .bulkString(bytes) = self else { return nil }
+        return bytes
     }
 
     /// Extracted container of data elements from `array` representations.

Sources/NIORedis/RESP/RESPValueConvertible.swift

@@ -1,5 +1,3 @@
-import Foundation
-
 /// Capable of converting to / from `RESPValue`.
 public protocol RESPValueConvertible {
     init?(_ value: RESPValue)
@@ -39,7 +37,7 @@ extension String: RESPValueConvertible {
 
     /// See `RESPValueConvertible.convertedToRESPValue()`
     public func convertedToRESPValue() -> RESPValue {
-        return .bulkString(Data(self.utf8))
+        return .bulkString(.init(self.utf8))
     }
 }
 
@@ -56,7 +54,7 @@ extension FixedWidthInteger {
 
     /// See `RESPValueConvertible.convertedToRESPValue()`
     public func convertedToRESPValue() -> RESPValue {
-        return .bulkString(Data(self.description.utf8))
+        return .bulkString(.init(self.description.utf8))
     }
 }
 
@@ -80,7 +78,7 @@ extension Double: RESPValueConvertible {
 
     /// See `RESPValueConvertible.convertedToRESPValue()`
     public func convertedToRESPValue() -> RESPValue {
-        return .bulkString(Data(self.description.utf8))
+        return .bulkString(.init(self.description.utf8))
     }
 }
 
@@ -93,19 +91,7 @@ extension Float: RESPValueConvertible {
 
     /// See `RESPValueConvertible.convertedToRESPValue()`
     public func convertedToRESPValue() -> RESPValue {
-        return .bulkString(Data(self.description.utf8))
-    }
-}
-
-extension Data: RESPValueConvertible {
-    public init?(_ value: RESPValue) {
-        guard let data = value.data else { return nil }
-        self = data
-    }
-
-    /// See `RESPValueConvertible.convertedToRESPValue()`
-    public func convertedToRESPValue() -> RESPValue {
-        return .bulkString(self)
+        return .bulkString(.init(self.description.utf8))
     }
 }
 

Sources/NIORedis/RedisClient.swift

@@ -1,5 +1,5 @@
+import struct Foundation.UUID
 import Logging
-import Foundation
 import NIO
 import NIOConcurrencyHelpers
 

Sources/NIORedis/RedisError.swift

@@ -1,4 +1,5 @@
-import Foundation
+import protocol Foundation.LocalizedError
+import class Foundation.Thread
 
 /// Errors thrown while working with Redis.
 public struct RedisError: CustomDebugStringConvertible, CustomStringConvertible, LocalizedError {

Sources/NIORedis/RedisPipeline.swift

@@ -1,4 +1,4 @@
-import Foundation
+import struct Foundation.UUID
 import Logging
 
 /// An object that provides a mechanism to "pipeline" multiple Redis commands in sequence,