Remove any force unwraps

vapor-community · May 19, 2017 · ceb4e00 · ceb4e00
1 parent 802eb33
commit ceb4e00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Sources/Models/Balance/Transaction.swift b/Sources/Models/Balance/Transaction.swift
@@ -11,12 +11,12 @@ import Helpers
 
 public class Transfer: StripeModelProtocol {
 
-    public let currency: StripeCurrency!
+    public let currency: StripeCurrency
     public let amount: Int
     public private(set) var sourceTypes = [SourceType]()
 
     public required init(node: Node) throws {
-        self.currency = try StripeCurrency(rawValue: node.get("currency"))
+        self.currency = try StripeCurrency(rawValue: node.get("currency"))!
         self.amount = try node.get("amount")
         let items: [String : Int] = try node.get("source_types")
         self.sourceTypes = try items.map { try SourceType(type: $0.key, amount: $0.value) }
@@ -30,7 +30,7 @@ public class Transfer: StripeModelProtocol {
         }
 
         return try Node(node: [
-            "currency": self.currency,
+            "currency": self.currency.rawValue,
             "amount": self.amount,
             "source_types": types
         ])

diff --git a/Sources/Models/Customer/Customer.swift b/Sources/Models/Customer/Customer.swift
@@ -16,7 +16,7 @@ import Helpers
  */
 public final class Customer: StripeModelProtocol {
 
-    public private(set) var id: String!
+    public private(set) var id: String
     public private(set) var object: String?
     public var accountBalance: Int?
     public private(set) var created: Date?
@@ -34,7 +34,9 @@ public final class Customer: StripeModelProtocol {
     public private(set) var sources: SourceList?
     public private(set) var subscriptions: SubscriptionList?
 
-    public init() { }
+    public init() {
+        self.id = ""
+    }
 
     public init(node: Node) throws {
         self.id = try node.get("id")