Skip to content

Commit 16f897f

Browse files
MarcoRecchioniMarcoRecchioni
committed
code cleanUp
1 parent b2d822f commit 16f897f

File tree

8 files changed

+268
-127
lines changed

8 files changed

+268
-127
lines changed

‎BreinifyApi/api/BreinActivity.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,12 @@ open class BreinActivity: BreinBase, ISecretStrategy {
146146
if nil == getBreinEngine() {
147147
throw BreinError.BreinRuntimeError("Rest engine not initialized. You have to configure BreinConfig with a valid engine.")
148148
}
149-
try getBreinEngine()?.sendActivity(self, success: success, failure: failure)
149+
150+
do {
151+
try getBreinEngine()?.sendActivity(self, success: success, failure: failure)
152+
} catch {
153+
BreinLogger.shared.log(error.localizedDescription)
154+
}
150155
}
151156

152157
/// Creates a dictionary that will be used for the request.

‎BreinifyApi/api/BreinLookup.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ open class BreinLookup: BreinBase, ISecretStrategy {
4141
setUser(breinUser)
4242
setBreinDimension(breinDimension)
4343

44-
return try getBreinEngine()!.performLookUp(self, success: successBlock, failure: failureBlock)
44+
do {
45+
return try getBreinEngine()!.performLookUp(self, success: successBlock, failure: failureBlock)
46+
} catch {
47+
BreinLogger.shared.log(error.localizedDescription)
48+
}
4549
}
4650

4751
/**
@@ -85,7 +89,7 @@ open class BreinLookup: BreinBase, ISecretStrategy {
8589
do {
8690
requestData["signatureType"] = try createSignature() as Any?
8791
} catch {
88-
BreinLogger.shared.log("Breinify not possible to generate signature")
92+
BreinLogger.shared.log("Breinify not possible to generate signature.")
8993
}
9094
}
9195

‎BreinifyApi/api/BreinRecommendation.swift‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
2222

2323
public init(numberOfRecommendation: Int!) {
2424
super.init()
25-
self.setNumberOfRecommendations(numberOfRecommendation)
25+
setNumberOfRecommendations(numberOfRecommendation)
2626
}
2727

2828
public init(breinUser: BreinUser?) {
2929
super.init()
30-
self.setUser(breinUser)
30+
setUser(breinUser)
3131
}
3232

3333
public init(breinUser: BreinUser?, numberOfRecommendation: Int!) {
3434
super.init()
35-
self.setUser(breinUser)
36-
self.setNumberOfRecommendations(numberOfRecommendations)
35+
setUser(breinUser)
36+
setNumberOfRecommendations(numberOfRecommendations)
3737
}
3838

3939
public func getCategory() -> String! {
40-
self.category
40+
category
4141
}
4242

4343
@discardableResult
@@ -47,12 +47,12 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
4747
}
4848

4949
public func getNumberOfRecommendations() -> Int {
50-
self.numberOfRecommendations
50+
numberOfRecommendations
5151
}
5252

5353
@discardableResult
5454
public func setNumberOfRecommendations(_ numOfRecommendations: Int) -> BreinRecommendation {
55-
self.numberOfRecommendations = numOfRecommendations
55+
numberOfRecommendations = numOfRecommendations
5656
return self
5757
}
5858

@@ -77,20 +77,20 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
7777
// firstly user data
7878
if let breinUser = getUser() {
7979
var userData = [String: Any]()
80-
breinUser.prepareUserRequest(&userData, breinConfig: self.getConfig())
80+
breinUser.prepareUserRequest(&userData, breinConfig: getConfig())
8181
requestData["user"] = userData as Any?
8282
}
8383

8484
// recommendation data
8585
var recommendationData = [String: Any]()
8686

8787
// optional field
88-
if let category = self.getCategory() {
88+
if let category = getCategory() {
8989
recommendationData["recommendationCategory"] = category as Any?
9090
}
9191

9292
// mandatory field
93-
recommendationData["numRecommendations"] = self.getNumberOfRecommendations() as Any?
93+
recommendationData["numRecommendations"] = getNumberOfRecommendations() as Any?
9494

9595
requestData["recommendation"] = recommendationData as Any?;
9696

@@ -110,8 +110,8 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
110110

111111
// create a new recommendation object
112112
let clonedBreinRecommendation = BreinRecommendation()
113-
.setNumberOfRecommendations(self.getNumberOfRecommendations())
114-
.setCategory(self.getCategory())
113+
.setNumberOfRecommendations(getNumberOfRecommendations())
114+
.setCategory(getCategory())
115115

116116
// clone from base class
117117
clonedBreinRecommendation.cloneBase(self)
@@ -124,6 +124,11 @@ open class BreinRecommendation: BreinBase, ISecretStrategy {
124124
*/
125125
public override func createSignature() throws -> String! {
126126
let message = String(getUnixTimestamp())
127-
return try BreinUtil.generateSignature(message, secret: getConfig()?.getSecret())
127+
do {
128+
return try BreinUtil.generateSignature(message, secret: getConfig()?.getSecret())
129+
} catch {
130+
BreinLogger.shared.log(error.localizedDescription)
131+
return ""
132+
}
128133
}
129134
}

‎BreinifyApi/api/BreinRequestManager.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ open class BreinRequestManager {
6060

6161
@objc
6262
public func sendActivityRequests() {
63-
BreinLogger.shared.log("Breinify sendActivityRequests invoked - number of missed requests are: \(self.missedRequests.count)")
63+
BreinLogger.shared.log("Breinify sendActivityRequests invoked - number of missed requests are: \(missedRequests.count)")
6464

6565
if missedRequests.count > 0 {
6666
BreinLogger.shared.log("Breinify invoking saved activity requests")
@@ -82,15 +82,15 @@ open class BreinRequestManager {
8282
}
8383

8484
public func getMissedRequests() -> [String: JsonRequest] {
85-
self.missedRequests
85+
missedRequests
8686
}
8787

8888
public func clearMissedRequests() {
89-
self.missedRequests = [String: JsonRequest]()
89+
missedRequests = [String: JsonRequest]()
9090
}
9191

9292
public func status() -> String {
93-
let numberOfRequests = "# :\(self.missedRequests.count)"
93+
let numberOfRequests = "# :\(missedRequests.count)"
9494
return numberOfRequests
9595
}
9696

@@ -129,7 +129,8 @@ open class BreinRequestManager {
129129

130130
*/
131131
public func shutdown() {
132-
safeMissedRequests()
132+
// deactivated now
133+
// safeMissedRequests()
133134
}
134135

135136
/**
@@ -144,8 +145,7 @@ open class BreinRequestManager {
144145
*/
145146
public func safeMissedRequests() {
146147

147-
if self.missedRequests.count > 0 {
148-
148+
if missedRequests.count > 0 {
149149
let fileURL = try! FileManager.default.url(for: .documentDirectory,
150150
in: .userDomainMask, appropriateFor: nil, create: false)
151151
.appendingPathComponent(kRequestFullFileName)
@@ -155,7 +155,7 @@ open class BreinRequestManager {
155155

156156
var output = ""
157157

158-
for (_, jsonElement) in self.missedRequests {
158+
for (_, jsonElement) in missedRequests {
159159
output = output
160160
+ "\(jsonElement.creationTime!)"
161161
+ kDelimiter
@@ -178,7 +178,7 @@ open class BreinRequestManager {
178178
}
179179

180180
// delete file if no entries exists
181-
if self.missedRequests.count == 0 {
181+
if missedRequests.count == 0 {
182182

183183
let fileManager = FileManager.default
184184
let fileName = kRequestFileName
@@ -209,7 +209,7 @@ open class BreinRequestManager {
209209
*/
210210
public func loadMissedRequests() {
211211

212-
if self.missedRequests.count == 0 {
212+
if missedRequests.count == 0 {
213213

214214
let fileName = kRequestFileName
215215
let docDirectory = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask,

‎BreinifyApi/api/BreinTemporalData.swift‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
1515
let kShapeTypesField = "shapeTypes"
1616

1717
public func setLocation(key: String, value: AnyObject) -> BreinTemporalData {
18-
_ = self.getUser()?.setAdditionalLocationEntry(key: key, value: value)
18+
_ = getUser()?.setAdditionalLocationEntry(key: key, value: value)
1919
return self
2020
}
2121

@@ -36,23 +36,23 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
3636
}
3737

3838
public func setLocalDateTime(_ localDateTime: String) -> BreinTemporalData {
39-
_ = self.getUser()?.setLocalDateTime(localDateTime)
39+
_ = getUser()?.setLocalDateTime(localDateTime)
4040
return self
4141
}
4242

4343
public func setTimezone(_ timezone: String) -> BreinTemporalData {
44-
_ = self.getUser()?.setTimezone(timezone)
44+
_ = getUser()?.setTimezone(timezone)
4545
return self
4646
}
4747

4848
// Lookup ip is part of the user.additional section
4949
public func setLookUpIpAddress(_ ipAddress: String) -> BreinTemporalData {
50-
_ = self.getUser()?.setIpAddress(ipAddress)
50+
_ = getUser()?.setIpAddress(ipAddress)
5151
return self
5252
}
5353

5454
public func getLookUpIpAddress() -> String? {
55-
self.getUser()?.getIpAddress()
55+
getUser()?.getIpAddress()
5656
}
5757

5858
/**
@@ -103,9 +103,13 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
103103

104104
setUser(breinUser)
105105

106-
return try getBreinEngine()!.performTemporalDataRequest(self,
107-
success: success,
108-
failure: failure)
106+
do {
107+
return try getBreinEngine()!.performTemporalDataRequest(self,
108+
success: success,
109+
failure: failure)
110+
} catch {
111+
BreinLogger.shared.log(error.localizedDescription)
112+
}
109113
}
110114

111115
override public func prepareJsonRequest() -> [String: Any]! {
@@ -116,12 +120,12 @@ open class BreinTemporalData: BreinBase, ISecretStrategy {
116120

117121
if let breinUser = getUser() {
118122
var userData = [String: Any]()
119-
breinUser.prepareUserRequest(&userData, breinConfig: self.getConfig())
123+
breinUser.prepareUserRequest(&userData, breinConfig: getConfig())
120124
requestData["user"] = userData as Any?
121125
}
122126

123127
// base level data...
124-
self.prepareBaseRequestData(&requestData)
128+
prepareBaseRequestData(&requestData)
125129

126130
return requestData
127131
}

0 commit comments

Comments
 (0)