Change useless Codables into Encodable and Decodable

Author: stevapple

Examples/CloudFunctions/Sources/ErrorHandling/main.swift

@@ -49,7 +49,7 @@ SCF.run { (context: SCF.Context, request: Request, callback: (Result<Response, E
 
 // MARK: - Request and Response
 
-struct Request: Codable {
+struct Request: Decodable {
     let requestID: String
     let error: Error
 
@@ -58,7 +58,7 @@ struct Request: Codable {
         self.error = error ?? .none
     }
 
-    public enum Error: Codable, RawRepresentable {
+    public enum Error: Decodable, RawRepresentable {
         case none
         case managed
         case unmanaged(String)
@@ -92,7 +92,7 @@ struct Request: Codable {
     }
 }
 
-struct Response: Codable {
+struct Response: Encodable {
     let scfRequestID: String
     let requestID: String
     let status: Status
@@ -103,7 +103,7 @@ struct Response: Codable {
         self.status = status
     }
 
-    public enum Status: Int, Codable {
+    public enum Status: Int, Encodable {
         case ok
         case error
     }

README.md

@@ -72,13 +72,13 @@ More commonly, the event would be a JSON, which is modeled using `Codable`, for
 // Import the module.
 import TencentSCFRuntime
 
-// Request, uses Codable for transparent JSON encoding.
-private struct Request: Codable {
+// Request, uses Decodable for transparent JSON decoding.
+private struct Request: Decodable {
     let name: String
 }
 
-// Response, uses Codable for transparent JSON encoding.
-private struct Response: Codable {
+// Response, uses Encodable for transparent JSON encoding.
+private struct Response: Encodable {
     let message: String
 }
 

Sources/CodableSample/main.swift

@@ -28,11 +28,11 @@
 import NIO
 import TencentSCFRuntime
 
-struct Request: Codable {
+struct Request: Decodable {
     let body: String
 }
 
-struct Response: Codable {
+struct Response: Encodable {
     let body: String
 }
 

Sources/TencentSCFEvents/APIGateway/APIGateway.swift

@@ -20,7 +20,7 @@ import class Foundation.JSONEncoder
 public enum APIGateway {
     /// `APIGateway.Request` contains data coming from the API Gateway.
     public struct Request<T: Decodable> {
-        public struct Context: Codable {
+        public struct Context: Decodable {
             public let identity: [String: String]
             public let serviceId: String
             public let path: String
@@ -42,15 +42,15 @@ public enum APIGateway {
         public let body: T?
     }
 
-    public enum Stage: String, Codable {
+    public enum Stage: String, Decodable {
         case test
         case debug
         case prepub
         case release
     }
 
     /// `APIGateway.Response` stores response ready for sending to the API Gateway.
-    public struct Response: Codable {
+    public struct Response: Encodable {
         public let statusCode: HTTPResponseStatus
         public let headers: HTTPHeaders
         public let body: String

Sources/TencentSCFEvents/CKafka.swift

@@ -15,7 +15,7 @@
 // https://cloud.tencent.com/document/product/583/17530
 
 public enum CKafka {
-    public struct Event: Codable, Equatable {
+    public struct Event: Decodable, Equatable {
         public typealias Record = Message
         public let records: [Record]
 
@@ -24,7 +24,7 @@ public enum CKafka {
         }
     }
 
-    public struct Message: Codable, Equatable {
+    public struct Message: Decodable, Equatable {
         public let topic: String
         public let partition: UInt64
         public let offset: UInt64
@@ -52,15 +52,5 @@ public enum CKafka {
             self.key = try container.decode(String.self, forKey: .key)
             self.body = try container.decode(String.self, forKey: .body)
         }
-
-        public func encode(to encoder: Encoder) throws {
-            var wrapperContainer = encoder.container(keyedBy: WrappingCodingKeys.self)
-            var container = wrapperContainer.nestedContainer(keyedBy: CodingKeys.self, forKey: .ckafka)
-            try container.encode(self.topic, forKey: .topic)
-            try container.encode(self.partition, forKey: .partition)
-            try container.encode(self.offset, forKey: .offset)
-            try container.encode(self.key, forKey: .key)
-            try container.encode(self.body, forKey: .body)
-        }
     }
 }

Sources/TencentSCFEvents/CMQTopic.swift

@@ -18,15 +18,15 @@ import struct Foundation.Date
 
 public enum CMQ {
     public enum Topic {
-        public struct Event: Codable, Equatable {
+        public struct Event: Decodable, Equatable {
             public let records: [Record]
 
             public enum CodingKeys: String, CodingKey {
                 case records = "Records"
             }
         }
 
-        public struct Record: Codable, Equatable {
+        public struct Record: Decodable, Equatable {
             internal static let type: String = "topic"
 
             public let topicOwner: UInt64
@@ -58,19 +58,9 @@ public enum CMQ {
                 topicName = try container.decode(String.self, forKey: .topicName)
                 subscriptionName = try container.decode(String.self, forKey: .subscriptionName)
             }
-
-            public func encode(to encoder: Encoder) throws {
-                var wrapperContainer = encoder.container(keyedBy: WrappingCodingKeys.self)
-                try wrapperContainer.encode(message, forKey: .cmq)
-                var container = wrapperContainer.nestedContainer(keyedBy: CodingKeys.self, forKey: .cmq)
-                try container.encode(Self.type, forKey: .type)
-                try container.encode(topicOwner, forKey: .topicOwner)
-                try container.encode(topicName, forKey: .topicName)
-                try container.encode(subscriptionName, forKey: .subscriptionName)
-            }
         }
 
-        public struct Message: Codable, Equatable {
+        public struct Message: Decodable, Equatable {
             internal static let separator: Character = ","
 
             public let id: String
@@ -100,15 +90,6 @@ public enum CMQ {
                 requestId = try container.decode(String.self, forKey: .requestId)
                 publishTime = try container.decode(Date.self, forKey: .publishTime, using: DateCoding.ISO8601WithFractionalSeconds.self)
             }
-
-            public func encode(to encoder: Encoder) throws {
-                var container = encoder.container(keyedBy: CodingKeys.self)
-                try container.encode(id, forKey: .messageId)
-                try container.encode(body, forKey: .messageBody)
-                try container.encode(tags.joined(separator: .init(Self.separator)), forKey: .messageTags)
-                try container.encode(publishTime, forKey: .publishTime, using: DateCoding.ISO8601WithFractionalSeconds.self)
-                try container.encode(requestId, forKey: .requestId)
-            }
         }
     }
 }

Sources/TencentSCFEvents/COS/COS.swift

@@ -18,7 +18,7 @@ import struct Foundation.URL
 // https://cloud.tencent.com/document/product/583/9707
 
 public enum COS {
-    public struct Event: Codable, Equatable {
+    public struct Event: Decodable, Equatable {
         public struct Record: Equatable {
             public let cos: Entity
 
@@ -39,7 +39,7 @@ public enum COS {
         }
     }
 
-    public struct RequestParameters: Codable, Equatable {
+    public struct RequestParameters: Decodable, Equatable {
         public let sourceIP: String
         public let headers: [String: String]
 
@@ -49,7 +49,7 @@ public enum COS {
         }
     }
 
-    public struct Entity: Codable, Equatable {
+    public struct Entity: Decodable, Equatable {
         public let notificationId: String
         public let schemaVersion: String
         public let bucket: Bucket
@@ -63,7 +63,7 @@ public enum COS {
         }
     }
 
-    public struct Bucket: Codable, Equatable {
+    public struct Bucket: Decodable, Equatable {
         public let region: String
         public let name: String
         public let appid: String

Sources/TencentSCFEvents/COS/EventRecord+Codable.swift renamed to Sources/TencentSCFEvents/COS/EventRecord+Decodable.swift

@@ -14,7 +14,7 @@
 
 import struct Foundation.Date
 
-extension COS.Event.Record: Codable {
+extension COS.Event.Record: Decodable {
     enum CodingKeys: String, CodingKey {
         case event
         case cos
@@ -45,19 +45,4 @@ extension COS.Event.Record: Codable {
         requestParameters = try eventContainer.decode(COS.RequestParameters.self, forKey: .requestParameters)
         eventTime = try eventContainer.decode(Date.self, forKey: .eventTime, using: DateCoding.UnixTimestamp.self)
     }
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(cos, forKey: .cos)
-
-        var eventContainer = container.nestedContainer(keyedBy: EventCodingKeys.self, forKey: .event)
-        try eventContainer.encode(eventName, forKey: .eventName)
-        try eventContainer.encode(eventVersion, forKey: .eventVersion)
-        try eventContainer.encode(eventSource, forKey: .eventSource)
-        try eventContainer.encode(eventQueue, forKey: .eventQueue)
-        try eventContainer.encode(eventTime, forKey: .eventTime, using: DateCoding.UnixTimestamp.self)
-        try eventContainer.encode(requestParameters, forKey: .requestParameters)
-        try eventContainer.encode(requestId, forKey: .requestId)
-        try eventContainer.encode(reservedInfo, forKey: .reservedInfo)
-    }
 }

Sources/TencentSCFEvents/COS/Object+Codable.swift renamed to Sources/TencentSCFEvents/COS/Object+Decodable.swift

@@ -17,7 +17,7 @@ import struct Foundation.URL
 
 // https://cloud.tencent.com/document/product/583/9707
 
-extension COS.Object: Codable {
+extension COS.Object: Decodable {
     enum CodingKeys: String, CodingKey {
         case url
         case key
@@ -53,21 +53,4 @@ extension COS.Object: Codable {
         customMeta = try container.decode([String: String].self, forKey: .meta)
             .compactMapKeys { $0.starts(with: "x-cos-meta-") ? String($0.dropFirst(11)) : nil }
     }
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(url, forKey: .url)
-        try container.encode(fullKey, forKey: .key)
-        try container.encode(vid, forKey: .vid)
-        try container.encode(size, forKey: .size)
-        try container.encode(customMeta.mapKeys { "x-cos-meta-" + $0 }, forKey: .meta)
-
-        var metaContainer = container.nestedContainer(keyedBy: MetaCodingKeys.self, forKey: .meta)
-        try metaContainer.encodeIfPresent(contentType, forKey: .contentType)
-        try metaContainer.encodeIfPresent(cacheControl, forKey: .cacheControl)
-        try metaContainer.encodeIfPresent(contentDisposition, forKey: .contentDisposition)
-        try metaContainer.encodeIfPresent(contentEncoding, forKey: .contentEncoding)
-        try metaContainer.encodeIfPresent(requestId, forKey: .requestId)
-        try metaContainer.encodeIfPresent(expireTime, forKey: .expireTime, using: DateCoding.RFC5322.self)
-    }
 }

Sources/TencentSCFEvents/CTimer.swift

@@ -17,9 +17,8 @@ import struct Foundation.Date
 // https://cloud.tencent.com/document/product/583/9708
 
 public enum CTimer {
-    public struct Event: Codable, Equatable {
-        internal static let type: String = "Timer"
-
+    public struct Event: Decodable, Equatable {
+        private static let type: String = "Timer"
         public let trigger: String
         public var time: Date
         public let message: String
@@ -41,13 +40,5 @@ public enum CTimer {
             time = try container.decode(Date.self, forKey: .time, using: DateCoding.ISO8601.self)
             message = try container.decode(String.self, forKey: .message)
         }
-
-        public func encode(to encoder: Encoder) throws {
-            var container = encoder.container(keyedBy: CodingKeys.self)
-            try container.encode(Self.type, forKey: .type)
-            try container.encode(trigger, forKey: .trigger)
-            try container.encode(time, forKey: .time, using: DateCoding.ISO8601.self)
-            try container.encode(message, forKey: .message)
-        }
     }
 }