code cleanUp

BreinifyApi/api/BreinActivity.swift

@@ -146,7 +146,12 @@ open class BreinActivity: BreinBase, ISecretStrategy {
         if nil == getBreinEngine() {
             throw BreinError.BreinRuntimeError("Rest engine not initialized. You have to configure BreinConfig with a valid engine.")
         }
-        try getBreinEngine()?.sendActivity(self, success: success, failure: failure)
+
+        do {
+            try getBreinEngine()?.sendActivity(self, success: success, failure: failure)
+        } catch {
+            BreinLogger.shared.log(error.localizedDescription)
+        }
     }
 
     /// Creates a dictionary that will be used for the request.

BreinifyApi/api/BreinLookup.swift

@@ -41,7 +41,11 @@ open class BreinLookup: BreinBase, ISecretStrategy {
         setUser(breinUser)
         setBreinDimension(breinDimension)
 
-        return try getBreinEngine()!.performLookUp(self, success: successBlock, failure: failureBlock)
+        do {
+            return try getBreinEngine()!.performLookUp(self, success: successBlock, failure: failureBlock)
+        } catch {
+            BreinLogger.shared.log(error.localizedDescription)
+        }
     }
 
     /**
@@ -85,7 +89,7 @@ open class BreinLookup: BreinBase, ISecretStrategy {
             do {
                 requestData["signatureType"] = try createSignature() as Any?
             } catch {
-                BreinLogger.shared.log("Breinify not possible to generate signature")
+                BreinLogger.shared.log("Breinify not possible to generate signature.")
             }
         }
 

BreinifyApi/api/BreinRecommendation.swift

@@ -22,22 +22,22 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
 
     public init(numberOfRecommendation: Int!) {
         super.init()
-        self.setNumberOfRecommendations(numberOfRecommendation)
+        setNumberOfRecommendations(numberOfRecommendation)
     }
 
     public init(breinUser: BreinUser?) {
         super.init()
-        self.setUser(breinUser)
+        setUser(breinUser)
     }
 
     public init(breinUser: BreinUser?, numberOfRecommendation: Int!) {
         super.init()
-        self.setUser(breinUser)
-        self.setNumberOfRecommendations(numberOfRecommendations)
+        setUser(breinUser)
+        setNumberOfRecommendations(numberOfRecommendations)
     }
 
     public func getCategory() -> String! {
-        self.category
+        category
     }
 
     @discardableResult
@@ -47,12 +47,12 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
     }
 
     public func getNumberOfRecommendations() -> Int {
-        self.numberOfRecommendations
+        numberOfRecommendations
     }
 
     @discardableResult
     public func setNumberOfRecommendations(_ numOfRecommendations: Int) -> BreinRecommendation {
-        self.numberOfRecommendations = numOfRecommendations
+        numberOfRecommendations = numOfRecommendations
         return self
     }
 
@@ -77,20 +77,20 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
         // firstly user data
         if let breinUser = getUser() {
             var userData = [String: Any]()
-            breinUser.prepareUserRequest(&userData, breinConfig: self.getConfig())
+            breinUser.prepareUserRequest(&userData, breinConfig: getConfig())
             requestData["user"] = userData as Any?
         }
 
         //  recommendation data
         var recommendationData = [String: Any]()
 
         // optional field
-        if let category = self.getCategory() {
+        if let category = getCategory() {
             recommendationData["recommendationCategory"] = category as Any?
         }
 
         // mandatory field
-        recommendationData["numRecommendations"] = self.getNumberOfRecommendations() as Any?
+        recommendationData["numRecommendations"] = getNumberOfRecommendations() as Any?
 
         requestData["recommendation"] = recommendationData as Any?;
 
@@ -110,8 +110,8 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
 
         // create a new recommendation object
         let clonedBreinRecommendation = BreinRecommendation()
-                .setNumberOfRecommendations(self.getNumberOfRecommendations())
-                .setCategory(self.getCategory())
+                .setNumberOfRecommendations(getNumberOfRecommendations())
+                .setCategory(getCategory())
 
         // clone from base class
         clonedBreinRecommendation.cloneBase(self)
@@ -124,6 +124,11 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
     */
     public override func createSignature() throws -> String! {
         let message = String(getUnixTimestamp())
-        return try BreinUtil.generateSignature(message, secret: getConfig()?.getSecret())
+        do {
+            return try BreinUtil.generateSignature(message, secret: getConfig()?.getSecret())
+        } catch {
+            BreinLogger.shared.log(error.localizedDescription)
+            return ""
+        }
     }
 }

BreinifyApi/api/BreinRequestManager.swift

@@ -60,7 +60,7 @@ open class BreinRequestManager {
 
     @objc
     public func sendActivityRequests() {
-        BreinLogger.shared.log("Breinify sendActivityRequests invoked - number of missed requests are: \(self.missedRequests.count)")
+        BreinLogger.shared.log("Breinify sendActivityRequests invoked - number of missed requests are: \(missedRequests.count)")
 
         if missedRequests.count > 0 {
             BreinLogger.shared.log("Breinify invoking saved activity requests")
@@ -82,15 +82,15 @@ open class BreinRequestManager {
     }
 
     public func getMissedRequests() -> [String: JsonRequest] {
-        self.missedRequests
+        missedRequests
     }
 
     public func clearMissedRequests() {
-        self.missedRequests = [String: JsonRequest]()
+        missedRequests = [String: JsonRequest]()
     }
 
     public func status() -> String {
-        let numberOfRequests = "# :\(self.missedRequests.count)"
+        let numberOfRequests = "# :\(missedRequests.count)"
         return numberOfRequests
     }
 
@@ -129,7 +129,8 @@ open class BreinRequestManager {
 
     */
     public func shutdown() {
-        safeMissedRequests()
+        // deactivated now
+        // safeMissedRequests()
     }
 
     /**
@@ -144,8 +145,7 @@ open class BreinRequestManager {
     */
     public func safeMissedRequests() {
 
-        if self.missedRequests.count > 0 {
-
+        if missedRequests.count > 0 {
             let fileURL = try! FileManager.default.url(for: .documentDirectory,
                             in: .userDomainMask, appropriateFor: nil, create: false)
                     .appendingPathComponent(kRequestFullFileName)
@@ -155,7 +155,7 @@ open class BreinRequestManager {
 
                 var output = ""
 
-                for (_, jsonElement) in self.missedRequests {
+                for (_, jsonElement) in missedRequests {
                     output = output
                             + "\(jsonElement.creationTime!)"
                             + kDelimiter
@@ -178,7 +178,7 @@ open class BreinRequestManager {
         }
 
         // delete file if no entries exists
-        if self.missedRequests.count == 0 {
+        if missedRequests.count == 0 {
 
             let fileManager = FileManager.default
             let fileName = kRequestFileName
@@ -209,7 +209,7 @@ open class BreinRequestManager {
     */
     public func loadMissedRequests() {
 
-        if self.missedRequests.count == 0 {
+        if missedRequests.count == 0 {
 
             let fileName = kRequestFileName
             let docDirectory = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask,

BreinifyApi/api/BreinTemporalData.swift

@@ -15,7 +15,7 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
     let kShapeTypesField = "shapeTypes"
 
     public func setLocation(key: String, value: AnyObject) -> BreinTemporalData {
-        _ = self.getUser()?.setAdditionalLocationEntry(key: key, value: value)
+        _ = getUser()?.setAdditionalLocationEntry(key: key, value: value)
         return self
     }
 
@@ -36,23 +36,23 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
     }
 
     public func setLocalDateTime(_ localDateTime: String) -> BreinTemporalData {
-        _ = self.getUser()?.setLocalDateTime(localDateTime)
+        _ = getUser()?.setLocalDateTime(localDateTime)
         return self
     }
 
     public func setTimezone(_ timezone: String) -> BreinTemporalData {
-        _ = self.getUser()?.setTimezone(timezone)
+        _ = getUser()?.setTimezone(timezone)
         return self
     }
 
     // Lookup ip is part of the user.additional section
     public func setLookUpIpAddress(_ ipAddress: String) -> BreinTemporalData {
-        _ = self.getUser()?.setIpAddress(ipAddress)
+        _ = getUser()?.setIpAddress(ipAddress)
         return self
     }
 
     public func getLookUpIpAddress() -> String? {
-        self.getUser()?.getIpAddress()
+        getUser()?.getIpAddress()
     }
 
     /**
@@ -103,9 +103,13 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
 
         setUser(breinUser)
 
-        return try getBreinEngine()!.performTemporalDataRequest(self,
-                success: success,
-                failure: failure)
+        do {
+            return try getBreinEngine()!.performTemporalDataRequest(self,
+                    success: success,
+                    failure: failure)
+        } catch {
+            BreinLogger.shared.log(error.localizedDescription)
+        }
     }
 
     override public func prepareJsonRequest() -> [String: Any]! {
@@ -116,12 +120,12 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
 
         if let breinUser = getUser() {
             var userData = [String: Any]()
-            breinUser.prepareUserRequest(&userData, breinConfig: self.getConfig())
+            breinUser.prepareUserRequest(&userData, breinConfig: getConfig())
             requestData["user"] = userData as Any?
         }
 
         // base level data...
-        self.prepareBaseRequestData(&requestData)
+        prepareBaseRequestData(&requestData)
 
         return requestData
     }