Merge pull request #327 from Iterable/feature/mob-1373-replace-iterab…

…leresult [MOB-1373] - Replace iterableResult
Iterable · May 27, 2020 · 3394b0a · 3394b0a
2 parents cbb29ce + eae97e6
commit 3394b0a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/swift-sdk/Internal/InAppHelper.swift b/swift-sdk/Internal/InAppHelper.swift
@@ -93,7 +93,7 @@ struct InAppHelper {
     }
 
     // process each parseResult and consumes failed message, if messageId is present
-    private static func process(parseResult: IterableResult<IterableInAppMessage, InAppMessageParser.ParseError>, apiClient: ApiClientProtocol) -> IterableInAppMessage? {
+    private static func process(parseResult: Result<IterableInAppMessage, InAppMessageParser.ParseError>, apiClient: ApiClientProtocol) -> IterableInAppMessage? {
         switch parseResult {
         case let .failure(parseError):
             switch parseError {

diff --git a/swift-sdk/Internal/InAppMessageParser.swift b/swift-sdk/Internal/InAppMessageParser.swift
@@ -12,7 +12,7 @@ struct InAppMessageParser {
 
     /// Given json payload, It will construct array of IterableInAppMessage or ParseError
     /// The caller needs to make sure to consume errored out messages
-    static func parse(payload: [AnyHashable: Any]) -> [IterableResult<IterableInAppMessage, ParseError>] {
+    static func parse(payload: [AnyHashable: Any]) -> [Result<IterableInAppMessage, ParseError>] {
         return getInAppDicts(fromPayload: payload).map {
             let oneJson = preProcessOneJson(fromJson: $0)
 
@@ -77,7 +77,7 @@ struct InAppMessageParser {
         }
     }
 
-    private static func parseOneMessage(fromJson json: [AnyHashable: Any]) -> IterableResult<IterableInAppMessage, ParseError> {
+    private static func parseOneMessage(fromJson json: [AnyHashable: Any]) -> Result<IterableInAppMessage, ParseError> {
         guard let messageId = json[JsonKey.messageId.jsonKey] as? String else {
             return .failure(.parseFailed(reason: "no messageId", messageId: nil))
         }

diff --git a/swift-sdk/Internal/IterableUtil.swift b/swift-sdk/Internal/IterableUtil.swift
@@ -7,12 +7,6 @@ import Foundation
 import os
 import UIKit
 
-/// Functionality such as this will be built in for Swift 5.0. This will help with the transition
-enum IterableResult<T, E> {
-    case success(T)
-    case failure(E)
-}
-
 @objc final class IterableUtil: NSObject {
     static var rootViewController: UIViewController? {
         if let rootViewController = UIApplication.shared.delegate?.window??.rootViewController {

diff --git a/tests/common/Common.swift b/tests/common/Common.swift
@@ -45,7 +45,7 @@ struct InAppTestHelper {
         return InAppMessageParser.parse(payload: payload).compactMap(parseResultToOptionalMessage)
     }
 
-    private static func parseResultToOptionalMessage(result: IterableResult<IterableInAppMessage, InAppMessageParser.ParseError>) -> IterableInAppMessage? {
+    private static func parseResultToOptionalMessage(result: Result<IterableInAppMessage, InAppMessageParser.ParseError>) -> IterableInAppMessage? {
         switch result {
         case .failure:
             return nil