Skip to content

Commit 3e4a773

Browse files
wiboscowibosco
committed
Removed custom Result type
1 parent f9cb451 commit 3e4a773

7 files changed

Lines changed: 94 additions & 65 deletions

File tree

‎NetworkingInOperations-Example.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
3DA271FC20F7D1E6001642D8 /* QueueManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DA271F920F7D1E6001642D8 /* QueueManager.swift */; };
10+
3DA271FC20F7D1E6001642D8 /* OperationQueueManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DA271F920F7D1E6001642D8 /* OperationQueueManager.swift */; };
1111
3DFEAD1F210DE0310076C30A /* QuestionsDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEAD1E210DE0310076C30A /* QuestionsDataManager.swift */; };
1212
3DFEAD21210DE0860076C30A /* Question.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEAD20210DE0860076C30A /* Question.swift */; };
1313
3DFEAD24210DE1040076C30A /* QuestionsRetrievalOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEAD23210DE1040076C30A /* QuestionsRetrievalOperation.swift */; };
@@ -41,7 +41,7 @@
4141
/* End PBXContainerItemProxy section */
4242

4343
/* Begin PBXFileReference section */
44-
3DA271F920F7D1E6001642D8 /* QueueManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueueManager.swift; sourceTree = "<group>"; };
44+
3DA271F920F7D1E6001642D8 /* OperationQueueManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperationQueueManager.swift; sourceTree = "<group>"; };
4545
3DFEAD1E210DE0310076C30A /* QuestionsDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionsDataManager.swift; sourceTree = "<group>"; };
4646
3DFEAD20210DE0860076C30A /* Question.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Question.swift; sourceTree = "<group>"; };
4747
3DFEAD23210DE1040076C30A /* QuestionsRetrievalOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionsRetrievalOperation.swift; sourceTree = "<group>"; };
@@ -97,7 +97,7 @@
9797
3DA271F820F7D1E6001642D8 /* Queue */ = {
9898
isa = PBXGroup;
9999
children = (
100-
3DA271F920F7D1E6001642D8 /* QueueManager.swift */,
100+
3DA271F920F7D1E6001642D8 /* OperationQueueManager.swift */,
101101
);
102102
path = Queue;
103103
sourceTree = "<group>";
@@ -436,7 +436,7 @@
436436
3DFEAD34210E1D060076C30A /* UserDataManager.swift in Sources */,
437437
3DFEAD28210DE26C0076C30A /* QuestionsViewController.swift in Sources */,
438438
3DFEAD31210E159E0076C30A /* User.swift in Sources */,
439-
3DA271FC20F7D1E6001642D8 /* QueueManager.swift in Sources */,
439+
3DA271FC20F7D1E6001642D8 /* OperationQueueManager.swift in Sources */,
440440
C21F1CB420F902E100D4138F /* RequestConfig.swift in Sources */,
441441
);
442442
runOnlyForDeploymentPostprocessing = 0;

‎NetworkingInOperations-Example/Data/Abstract/ConcurrentOperation.swift‎

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,24 @@
99
import Foundation
1010
import UIKit
1111

12-
enum Result<T> {
13-
case success(T)
14-
case failure(Error)
12+
enum ConcurrentOperationError: Error, Equatable {
13+
case cancelled
1514
}
1615

17-
class ConcurrentOperation<T>: Operation {
16+
class ConcurrentOperation<Value>: Operation, @unchecked Sendable {
17+
typealias OperationCompletionHandler = (_ result: Result<Value, Error>) -> Void
1818

19-
typealias OperationCompletionHandler = (_ result: Result<T>) -> Void
19+
private(set) var completionHandler: (OperationCompletionHandler)?
2020

21-
var completionHandler: (OperationCompletionHandler)?
21+
private let lock = NSRecursiveLock()
22+
23+
// MARK: - Init
24+
25+
init(completionHandler: @escaping (_ result: Result<Value, Error>) -> Void) {
26+
self.completionHandler = completionHandler
27+
28+
super.init()
29+
}
2230

2331
// MARK: - State
2432

@@ -28,14 +36,29 @@ class ConcurrentOperation<T>: Operation {
2836
case finished = "isFinished"
2937
}
3038

31-
private var state = State.ready {
39+
private var _state = State.ready {
3240
willSet {
3341
willChangeValue(forKey: newValue.rawValue)
34-
willChangeValue(forKey: state.rawValue)
42+
willChangeValue(forKey: _state.rawValue)
3543
}
3644
didSet {
3745
didChangeValue(forKey: oldValue.rawValue)
38-
didChangeValue(forKey: state.rawValue)
46+
didChangeValue(forKey: _state.rawValue)
47+
}
48+
}
49+
50+
private var state: State {
51+
get {
52+
lock.lock()
53+
defer { lock.unlock() }
54+
55+
return _state
56+
}
57+
set {
58+
lock.lock()
59+
defer { lock.unlock() }
60+
61+
_state = newValue
3962
}
4063
}
4164

@@ -51,42 +74,39 @@ class ConcurrentOperation<T>: Operation {
5174
return state == .finished
5275
}
5376

54-
// MARK: - Start
77+
override var isAsynchronous: Bool {
78+
return true
79+
}
80+
81+
// MARK: - Lifecycle
5582

5683
override func start() {
5784
guard !isCancelled else {
58-
finish()
85+
finish(result: .failure(ConcurrentOperationError.cancelled))
5986
return
6087
}
6188

62-
if !isExecuting {
63-
state = .executing
64-
}
89+
state = .executing
6590

6691
main()
6792
}
6893

69-
// MARK: - Finish
70-
71-
func finish() {
72-
if isExecuting {
73-
state = .finished
74-
}
75-
}
76-
77-
func complete(result: Result<T>) {
78-
finish()
79-
80-
if !isCancelled {
81-
completionHandler?(result)
94+
func finish(result: Result<Value, Error>) {
95+
lock.lock()
96+
defer { lock.unlock() }
97+
98+
guard !isFinished else {
99+
return
82100
}
101+
102+
state = .finished
103+
104+
completionHandler?(result)
83105
}
84106

85-
// MARK: - Cancel
86-
87107
override func cancel() {
88108
super.cancel()
89109

90-
finish()
110+
finish(result: .failure(ConcurrentOperationError.cancelled))
91111
}
92112
}

‎NetworkingInOperations-Example/Data/Managers/Questions/Operations/QuestionsRetrievalOperation.swift‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@
88

99
import Foundation
1010

11-
class QuestionsRetrievalOperation: ConcurrentOperation<QuestionPage> {
12-
11+
class QuestionsRetrievalOperation: ConcurrentOperation<QuestionPage>, @unchecked Sendable {
1312
private let session: URLSession
1413
private let urlRequestFactory: QuestionsURLRequestFactory
1514
private var task: URLSessionTask?
1615
private let pageIndex: Int
1716

1817
// MARK: - Init
1918

20-
init(pageIndex: Int, session: URLSession = URLSession.shared, urlRequestFactory: QuestionsURLRequestFactory = QuestionsURLRequestFactory()) {
19+
init(pageIndex: Int,
20+
session: URLSession = URLSession.shared,
21+
urlRequestFactory: QuestionsURLRequestFactory = QuestionsURLRequestFactory(),
22+
completionHandler: @escaping (_ result: Result<QuestionPage, Error>) -> Void) {
2123
self.pageIndex = pageIndex
2224
self.session = session
2325
self.urlRequestFactory = urlRequestFactory
26+
27+
super.init(completionHandler: completionHandler)
2428
}
2529

2630
// MARK: - Main
@@ -32,9 +36,9 @@ class QuestionsRetrievalOperation: ConcurrentOperation<QuestionPage> {
3236
guard let data = data else {
3337
DispatchQueue.main.async {
3438
if let error = error {
35-
self.complete(result: .failure(error))
39+
self.finish(result: .failure(error))
3640
} else {
37-
self.complete(result: .failure(APIError.missingData))
41+
self.finish(result: .failure(APIError.missingData))
3842
}
3943
}
4044
return
@@ -44,12 +48,12 @@ class QuestionsRetrievalOperation: ConcurrentOperation<QuestionPage> {
4448
let page = try JSONDecoder().decode(QuestionPage.self, from: data)
4549

4650
DispatchQueue.main.async {
47-
self.complete(result: .success(page))
51+
self.finish(result: .success(page))
4852
}
4953
} catch let error {
5054
DispatchQueue.main.async {
5155
print(error)
52-
self.complete(result: .failure(APIError.serialization))
56+
self.finish(result: .failure(APIError.serialization))
5357
}
5458
}
5559
}

‎NetworkingInOperations-Example/Data/Managers/Questions/QuestionsDataManager.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@
99
import Foundation
1010

1111
class QuestionsDataManager {
12-
13-
private let queueManager: QueueManager
12+
private let queueManager: OperationQueueManager
1413

1514
// MARK: - Init
1615

17-
init(withQueueManager queueManager: QueueManager = QueueManager.shared) {
16+
init(withQueueManager queueManager: OperationQueueManager = OperationQueueManager.shared) {
1817
self.queueManager = queueManager
1918
}
2019

2120
// MARK: - Retrieval
2221

23-
func retrievalQuestions(pageIndex: Int, completionHandler: @escaping (_ result: Result<QuestionPage>) -> Void) {
24-
let operation = QuestionsRetrievalOperation(pageIndex: pageIndex)
25-
operation.completionHandler = completionHandler
22+
func retrievalQuestions(pageIndex: Int,
23+
completionHandler: @escaping (_ result: Result<QuestionPage, Error>) -> Void) {
24+
let operation = QuestionsRetrievalOperation(pageIndex: pageIndex,
25+
completionHandler: completionHandler)
26+
2627
queueManager.enqueue(operation)
2728
}
2829
}

‎NetworkingInOperations-Example/Data/Managers/User/Operations/AvatarRetrievalOperation.swift‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@
99
import Foundation
1010
import UIKit
1111

12-
class AvatarRetrievalOperation: ConcurrentOperation<(User, UIImage)> {
13-
12+
class AvatarRetrievalOperation: ConcurrentOperation<(User, UIImage)>, @unchecked Sendable {
1413
private let session: URLSession
1514
private let user: User
1615
private var task: URLSessionTask?
1716

1817
// MARK: - Init
1918

20-
init(session: URLSession = URLSession.shared, user: User) {
19+
init(session: URLSession = URLSession.shared,
20+
user: User,
21+
completionHandler: @escaping (_ result: Result<(User, UIImage), Error>) -> Void) {
2122
self.session = session
2223
self.user = user
24+
25+
super.init(completionHandler: completionHandler)
2326
}
2427

2528
// MARK: - Main
@@ -36,16 +39,16 @@ class AvatarRetrievalOperation: ConcurrentOperation<(User, UIImage)> {
3639
let image = UIImage(data: data) else {
3740
DispatchQueue.main.async {
3841
if let error = error {
39-
self.complete(result: .failure(error))
42+
self.finish(result: .failure(error))
4043
} else {
41-
self.complete(result: .failure(APIError.missingData))
44+
self.finish(result: .failure(APIError.missingData))
4245
}
4346
}
4447
return
4548
}
4649

4750
DispatchQueue.main.async {
48-
self.complete(result: .success((self.user, image)))
51+
self.finish(result: .success((self.user, image)))
4952
}
5053
}
5154

‎NetworkingInOperations-Example/Data/Managers/User/UserDataManager.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ import Foundation
1010
import UIKit
1111

1212
class UserDataManager {
13-
14-
private let queueManager: QueueManager
13+
private let queueManager: OperationQueueManager
1514

1615
// MARK: - Init
1716

18-
init(withQueueManager queueManager: QueueManager = QueueManager.shared) {
17+
init(withQueueManager queueManager: OperationQueueManager = OperationQueueManager.shared) {
1918
self.queueManager = queueManager
2019
}
2120

2221
// MARK: - Avatar
2322

24-
func retrieveAvatar(forUser user: User, completionHandler: @escaping (_ result: Result<(User, UIImage)>) -> Void) {
25-
let operation = AvatarRetrievalOperation(user: user)
26-
operation.completionHandler = completionHandler
23+
func retrieveAvatar(forUser user: User,
24+
completionHandler: @escaping (_ result: Result<(User, UIImage), Error>) -> Void) {
25+
let operation = AvatarRetrievalOperation(user: user,
26+
completionHandler: completionHandler)
27+
2728
queueManager.enqueue(operation)
2829
}
2930
}

NetworkingInOperations-Example/Managers/Queue/QueueManager.swift renamed to NetworkingInOperations-Example/Managers/Queue/OperationQueueManager.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//
2-
// QueueManager.swift
3-
// BikePoint
2+
// OperationQueueManager.swift
3+
// NetworkingInOperations-Example
44
//
5-
// Created by William Boles on 23/06/2017.
6-
// Copyright © 2017 Springtiger. All rights reserved.
5+
// Created by William Boles on 29/07/2018.
6+
// Copyright © 2018 Boles. All rights reserved.
77
//
88

99
import Foundation
1010

11-
class QueueManager {
11+
class OperationQueueManager {
1212

1313
lazy var queue: OperationQueue = {
1414
let queue = OperationQueue()
@@ -18,7 +18,7 @@ class QueueManager {
1818

1919
// MARK: - Singleton
2020

21-
static let shared = QueueManager()
21+
static let shared = OperationQueueManager()
2222

2323
// MARK: - Addition
2424

0 commit comments

Comments
 (0)