Merge pull request #1385 from Alamofire/feature/refactoring-apis-for-…

…swift-3 Refactored All APIs for Swift 3
Alamofire · Aug 10, 2016 · aebd1d4 · aebd1d4
2 parents a94323c + 8c5a83b
commit aebd1d4
Show file tree

Hide file tree

Showing 38 changed files with 3,571 additions and 3,815 deletions.
diff --git a/Alamofire.xcodeproj/project.pbxproj b/Alamofire.xcodeproj/project.pbxproj
diff --git a/Example/Source/AppDelegate.swift b/Example/Source/AppDelegate.swift
@@ -52,10 +52,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
         onto primaryViewController: UIViewController)
         -> Bool
     {
-        if let secondaryAsNavController = secondaryViewController as? UINavigationController {
-            if let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController {
-                return topAsDetailController.request == nil
-            }
+        if
+            let secondaryAsNavController = secondaryViewController as? UINavigationController,
+            let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController
+        {
+            return topAsDetailController.request == nil
         }
 
         return false

diff --git a/Example/Source/DetailViewController.swift b/Example/Source/DetailViewController.swift
@@ -112,13 +112,11 @@ class DetailViewController: UITableViewController {
                 options: .skipsHiddenFiles
             )
 
-            if let fileURL = contents.first,
-               let data = try? Data(contentsOf: fileURL)
-            {
+            if let fileURL = contents.first, let data = try? Data(contentsOf: fileURL) {
                 let json = try JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions())
                 let prettyData = try JSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
 
-                if let prettyString = NSString(data: prettyData, encoding: String.Encoding.utf8.rawValue) as? String {
+                if let prettyString = String(data: prettyData, encoding: String.Encoding.utf8) {
                     try fileManager.removeItem(at: fileURL)
                     return prettyString
                 }

diff --git a/Example/Source/MasterViewController.swift b/Example/Source/MasterViewController.swift
@@ -46,8 +46,9 @@ class MasterViewController: UITableViewController {
         if let split = splitViewController {
             let controllers = split.viewControllers
 
-            if let navigationController = controllers.last as? UINavigationController,
-               let topViewController = navigationController.topViewController as? DetailViewController
+            if
+                let navigationController = controllers.last as? UINavigationController,
+                let topViewController = navigationController.topViewController as? DetailViewController
             {
                 detailViewController = topViewController
             }
@@ -57,30 +58,31 @@ class MasterViewController: UITableViewController {
     // MARK: - UIStoryboardSegue
 
     override func prepare(for segue: UIStoryboardSegue, sender: AnyObject?) {
-        if let navigationController = segue.destination as? UINavigationController,
-           let detailViewController = navigationController.topViewController as? DetailViewController
+        if
+            let navigationController = segue.destination as? UINavigationController,
+            let detailViewController = navigationController.topViewController as? DetailViewController
         {
             func requestForSegue(_ segue: UIStoryboardSegue) -> Request? {
                 switch segue.identifier! {
                 case "GET":
                     detailViewController.segueIdentifier = "GET"
-                    return Alamofire.request(.GET, "https://httpbin.org/get")
+                    return Alamofire.request("https://httpbin.org/get", withMethod: .get)
                 case "POST":
                     detailViewController.segueIdentifier = "POST"
-                    return Alamofire.request(.POST, "https://httpbin.org/post")
+                    return Alamofire.request("https://httpbin.org/post", withMethod: .post)
                 case "PUT":
                     detailViewController.segueIdentifier = "PUT"
-                    return Alamofire.request(.PUT, "https://httpbin.org/put")
+                    return Alamofire.request("https://httpbin.org/put", withMethod: .put)
                 case "DELETE":
                     detailViewController.segueIdentifier = "DELETE"
-                    return Alamofire.request(.DELETE, "https://httpbin.org/delete")
+                    return Alamofire.request("https://httpbin.org/delete", withMethod: .delete)
                 case "DOWNLOAD":
                     detailViewController.segueIdentifier = "DOWNLOAD"
                     let destination = Alamofire.Request.suggestedDownloadDestination(
                         directory: .cachesDirectory,
                         domain: .userDomainMask
                     )
-                    return Alamofire.download(.GET, "https://httpbin.org/stream/1", destination: destination)
+                    return Alamofire.download("https://httpbin.org/stream/1", to: destination, withMethod: .get)
                 default:
                     return nil
                 }