Chainable onSuccess and onFailure.

Author: tapashmajumder

Tests/swift-sdk-swift-tests/PromiseTests.swift

@@ -25,11 +25,10 @@ class PromiseTests: XCTestCase {
         let f1 = createSucessfulFuture(withValue: "zeeString")
         let f2 = f1.map {$0.count}
 
-        f2.onSuccess = { (value) in
+        f2.onSuccess { (value) in
             XCTAssertEqual(value, "zeeString".count)
             expectation1.fulfill()
-        }
-        f2.onFailure = {_ in
+        } .onFailure { _ in
             expectation2.fulfill()
         }
 
@@ -45,10 +44,9 @@ class PromiseTests: XCTestCase {
         let f1: Future<String, MyError> = createFailureFuture(withError: MyError(message: "zeeErrorMessage"))
         let f2 = f1.map {$0.count}
 
-        f2.onSuccess = { (value) in
+        f2.onSuccess { (value) in
             expectation1.fulfill()
-        }
-        f2.onFailure = {error in
+        }.onFailure { error in
             XCTAssertEqual(error.message, "zeeErrorMessage")
             expectation2.fulfill()
         }
@@ -69,11 +67,10 @@ class PromiseTests: XCTestCase {
             return self.createSucessfulFuture(withValue: firstValue + firstValue)
         }
 
-        f2.onSuccess = { (secondValue) in
+        f2.onSuccess { (secondValue) in
             XCTAssertEqual(secondValue, "zeeStringzeeString")
             expectation1.fulfill()
-        }
-        f2.onFailure = {_ in
+        } .onFailure { _ in
             expectation2.fulfill()
         }
 
@@ -93,10 +90,9 @@ class PromiseTests: XCTestCase {
             return self.createSucessfulFuture(withValue: "zeeString")
         }
 
-        f2.onSuccess = { (secondValue) in
+        f2.onSuccess { (secondValue) in
             expectation1.fulfill()
-        }
-        f2.onFailure = {(error) in
+        } .onFailure {(error) in
             XCTAssertEqual(error.message, "zeeErrorMessage")
             expectation2.fulfill()
         }
@@ -117,10 +113,9 @@ class PromiseTests: XCTestCase {
             return self.createFailureFuture(withError: MyError(message: "zeeErrorMessage"))
         }
 
-        f2.onSuccess = { (secondValue) in
+        f2.onSuccess { (secondValue) in
             expectation1.fulfill()
-        }
-        f2.onFailure = {(error) in
+        }.onFailure {(error) in
             XCTAssertEqual(error.message, "zeeErrorMessage")
             expectation2.fulfill()
         }
@@ -136,11 +131,10 @@ class PromiseTests: XCTestCase {
 
         let f1: Future<String, MyError> = Promise<String, MyError>(value: "zeeValue")
 
-        f1.onSuccess = { (value) in
+        f1.onSuccess { (value) in
             XCTAssertEqual(value, "zeeValue")
             expectation1.fulfill()
-        }
-        f1.onFailure = {_ in
+        }.onFailure { _ in
             expectation2.fulfill()
         }
 
@@ -155,10 +149,9 @@ class PromiseTests: XCTestCase {
 
         let f1: Future<String, MyError> = Promise<String, MyError>(error: MyError(message: "zeeErrorMessage"))
 
-        f1.onSuccess = { (value) in
+        f1.onSuccess { (value) in
             expectation1.fulfill()
-        }
-        f1.onFailure = { error in
+        }.onFailure { error in
             XCTAssertEqual(error.message, "zeeErrorMessage")
             expectation2.fulfill()
         }

swift-sdk/Internal/IterableAPIInternal.swift

@@ -112,15 +112,11 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
 
         if let userId = userId {
             // if we are using userId, then create a user first, then register
-            let future = createUser(withUserId: userId).flatMap({ (_)  in
+            createUser(withUserId: userId).flatMap({ (_)  in
                 return self.register(token: token, appName: appName, pushServicePlatform: self.config.pushPlatform)
-            })
-            
-            future.onSuccess = { (json) in
+            }).onSuccess { (json) in
                 onSuccess?(json)
-            }
-            
-            future.onFailure = { (error) in
+            }.onFailure { (error) in
                 onFailure?(error.errorMessage, error.data)
             }
         } else {
@@ -531,17 +527,11 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
     }
 
     @discardableResult func sendRequest(_ request: URLRequest, onSuccess: OnSuccessHandler? = nil, onFailure: OnFailureHandler? = nil) -> Future<SendRequestValue, SendRequestError> {
-        let future = NetworkHelper.sendRequest(request, usingSession: networkSession)
-        
-        future.onSuccess = { (json) in
+        return NetworkHelper.sendRequest(request, usingSession: networkSession).onSuccess { (json) in
             onSuccess?(json)
-        }
-        
-        future.onFailure = { (failureInfo) in
+        }.onFailure { (failureInfo) in
             onFailure?(failureInfo.errorMessage, failureInfo.data)
         }
-        
-        return future
     }
 
     // MARK: For Private and Internal Use ========================================>
@@ -607,8 +597,7 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
             return
         }
 
-        let future = notificationStateProvider.notificationsEnabled
-        future.onSuccess = {(authorized) in
+        notificationStateProvider.notificationsEnabled.onSuccess { (authorized) in
             if authorized {
                 self.notificationStateProvider.registerForRemoteNotifications()
             }
@@ -797,11 +786,9 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
             return
         }
 
-        let future = NetworkHelper.sendRequest(request, usingSession: networkSession)
-        future.onSuccess = { (json) in
+        NetworkHelper.sendRequest(request, usingSession: networkSession).onSuccess { (json) in
             self.handleDDL(json: json)
-        }
-        future.onFailure = { (failureInfo) in
+        }.onFailure { (failureInfo) in
             if let errorMessage = failureInfo.errorMessage {
                 ITBError(errorMessage)
             }

swift-sdk/Internal/Promise.swift

@@ -18,24 +18,31 @@ enum Result<Value, ErrorType> {
 // or there is a failure with error
 // There is no way to set value a result in this class.
 class Future<Value, ErrorType> {
-    var onSuccess: ((Value) -> Void)? = nil {
-        didSet {
-            // if a successful result already exists (from constructor), report it
-            if case let Result.value(value)? = result {
-                onSuccess?(value)
-            }
+    fileprivate var successCallback: ((Value) -> Void)? = nil
+    fileprivate var failureCallback: ((ErrorType) -> Void)? = nil
+
+    @discardableResult func onSuccess(block: ((Value) -> Void)? = nil) -> Future<Value, ErrorType> {
+        self.successCallback = block
+
+        // if a successful result already exists (from constructor), report it
+        if case let Result.value(value)? = result {
+            successCallback?(value)
         }
+        
+        return self
     }
 
-    var onFailure : ((ErrorType) -> Void)? = nil {
-        didSet {
-             // if a failed result already exists (from constructor), report it
-            if case let Result.error(error)? = result {
-                onFailure?(error)
-            }
+    @discardableResult func onFailure(block: ((ErrorType) -> Void)? = nil) -> Future<Value, ErrorType> {
+        self.failureCallback = block
+        
+        // if a failed result already exists (from constructor), report it
+        if case let Result.error(error)? = result {
+            failureCallback?(error)
         }
+
+        return self
     }
-    
+
     fileprivate var result: Result<Value, ErrorType>? {
         // Observe whenever a result is assigned, and report it
         didSet { result.map(report) }
@@ -45,11 +52,11 @@ class Future<Value, ErrorType> {
     private func report(result: Result<Value, ErrorType>) {
         switch result {
         case .value(let value):
-            onSuccess?(value)
+            successCallback?(value)
             break
         case .error(let error):
             print("calling onFailure")
-            onFailure?(error)
+            failureCallback?(error)
             break
         }
     }
@@ -59,19 +66,19 @@ extension Future {
     func flatMap<NextValue>(_ closure: @escaping (Value) -> Future<NextValue, ErrorType>) -> Future<NextValue, ErrorType> {
         let promise = Promise<NextValue, ErrorType>()
 
-        onSuccess = { value in
+        onSuccess { (value) in
             let future = closure(value)
 
-            future.onSuccess = { futureValue in
+            future.onSuccess { futureValue in
                 promise.resolve(with: futureValue)
             }
 
-            future.onFailure = { futureError in
+            future.onFailure { futureError in
                 promise.reject(with: futureError)
             }
         }
 
-        onFailure = { error in
+        onFailure  { error in
             promise.reject(with: error)
         }
 
@@ -81,12 +88,12 @@ extension Future {
     func map<NextValue>(_ closure: @escaping (Value) -> NextValue) -> Future<NextValue, ErrorType> {
         let promise = Promise<NextValue, ErrorType>()
 
-        onSuccess = { value in
+        onSuccess { value in
             let nextValue = closure(value)
             promise.resolve(with: nextValue)
         }
 
-        onFailure = { error in
+        onFailure { error in
             promise.reject(with: error)
         }