Remove PSQLJSONEncoder (vapor#215)

Author: fabianfett

Sources/PostgresNIO/Connection/PostgresConnection+Connect.swift

@@ -12,7 +12,7 @@ extension PostgresConnection {
     ) -> EventLoopFuture<PostgresConnection> {
 
         let coders = PSQLConnection.Configuration.Coders(
-            jsonEncoder: PostgresJSONEncoderWrapper(_defaultJSONEncoder)
+            jsonEncoder: _defaultJSONEncoder
         )
 
         let configuration = PSQLConnection.Configuration(

Sources/PostgresNIO/New/Messages/Bind.swift

@@ -12,7 +12,7 @@ extension PSQLFrontendMessage {
         /// The number of parameter values that follow (possibly zero). This must match the number of parameters needed by the query.
         var parameters: [PSQLEncodable]
 
-        func encode(into buffer: inout ByteBuffer, using jsonEncoder: PSQLJSONEncoder) throws {
+        func encode(into buffer: inout ByteBuffer, using jsonEncoder: PostgresJSONEncoder) throws {
             buffer.writeNullTerminatedString(self.portalName)
             buffer.writeNullTerminatedString(self.preparedStatementName)
 

Sources/PostgresNIO/New/PSQL+JSON.swift

@@ -55,7 +55,7 @@ extension PSQLEncodable {
 }
 
 struct PSQLEncodingContext {
-    let jsonEncoder: PSQLJSONEncoder
+    let jsonEncoder: PostgresJSONEncoder
 }
 
 struct PSQLDecodingContext {

Sources/PostgresNIO/New/PSQLCodable.swift

@@ -13,9 +13,9 @@ final class PSQLConnection {
     struct Configuration {
 
         struct Coders {
-            var jsonEncoder: PSQLJSONEncoder
+            var jsonEncoder: PostgresJSONEncoder
 
-            init(jsonEncoder: PSQLJSONEncoder) {
+            init(jsonEncoder: PostgresJSONEncoder) {
                 self.jsonEncoder = jsonEncoder
             }
 

Sources/PostgresNIO/New/PSQLConnection.swift

@@ -2,9 +2,9 @@
 struct PSQLFrontendMessageEncoder: MessageToByteEncoder {
     typealias OutboundIn = PSQLFrontendMessage
 
-    let jsonEncoder: PSQLJSONEncoder
+    let jsonEncoder: PostgresJSONEncoder
 
-    init(jsonEncoder: PSQLJSONEncoder) {
+    init(jsonEncoder: PostgresJSONEncoder) {
         self.jsonEncoder = jsonEncoder
     }
 

Sources/PostgresNIO/New/PSQLFrontendMessageEncoder.swift

@@ -1,18 +1,5 @@
 import NIOCore
 
-struct PostgresJSONEncoderWrapper: PSQLJSONEncoder {
-    let downstream: PostgresJSONEncoder
-    
-    init(_ downstream: PostgresJSONEncoder) {
-        self.downstream = downstream
-    }
-    
-    func encode<T>(_ value: T, into buffer: inout ByteBuffer) throws where T : Encodable {
-        let data = try self.downstream.encode(value)
-        buffer.writeData(data)
-    }
-}
-
 extension PostgresData: PSQLEncodable {
     var psqlType: PostgresDataType {
         self.type

Sources/PostgresNIO/Postgres+PSQLCompat.swift

@@ -1,10 +1,20 @@
 import Foundation
+import NIOFoundationCompat
 
 /// A protocol that mimicks the Foundation `JSONEncoder.encode(_:)` function.
 /// Conform a non-Foundation JSON encoder to this protocol if you want PostgresNIO to be
 /// able to use it when encoding JSON & JSONB values (see `PostgresNIO._defaultJSONEncoder`)
 public protocol PostgresJSONEncoder {
     func encode<T>(_ value: T) throws -> Data where T : Encodable
+
+    func encode<T: Encodable>(_ value: T, into buffer: inout ByteBuffer) throws
+}
+
+extension PostgresJSONEncoder {
+    public func encode<T: Encodable>(_ value: T, into buffer: inout ByteBuffer) throws {
+        let data = try self.encode(value)
+        buffer.writeData(data)
+    }
 }
 
 extension JSONEncoder: PostgresJSONEncoder {}

Sources/PostgresNIO/Utilities/PostgresJSONEncoder.swift

@@ -73,12 +73,16 @@ class JSON_PSQLCodableTests: XCTestCase {
     }
 
     func testCustomEncoderIsUsed() {
-        class TestEncoder: PSQLJSONEncoder {
+        class TestEncoder: PostgresJSONEncoder {
             var encodeHits = 0
 
             func encode<T>(_ value: T, into buffer: inout ByteBuffer) throws where T : Encodable {
                 self.encodeHits += 1
             }
+
+            func encode<T>(_ value: T) throws -> Data where T : Encodable {
+                preconditionFailure()
+            }
         }
 
         let hello = Hello(name: "world")

Tests/PostgresNIOTests/New/Data/JSON+PSQLCodableTests.swift

@@ -14,7 +14,7 @@ extension PSQLDecodingContext {
 }
 
 extension PSQLEncodingContext {
-    static func forTests(jsonEncoder: PSQLJSONEncoder = JSONEncoder()) -> Self {
+    static func forTests(jsonEncoder: PostgresJSONEncoder = JSONEncoder()) -> Self {
         Self(jsonEncoder: jsonEncoder)
     }
 }