Skip to content

Commit fc1ff51

Browse files
committed
Code review
1 parent 834d0d5 commit fc1ff51

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Waiter.swift

+18-25
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,34 @@
1515
import NIO
1616

1717
extension HTTPConnectionPool {
18-
struct Waiter {
19-
struct ID: Hashable {
20-
private let objectIdentifier: ObjectIdentifier
18+
struct RequestID: Hashable {
19+
private let objectIdentifier: ObjectIdentifier
2120

22-
init(_ request: HTTPScheduledRequest) {
23-
self.objectIdentifier = ObjectIdentifier(request)
24-
}
21+
init(_ request: HTTPScheduledRequest) {
22+
self.objectIdentifier = ObjectIdentifier(request)
2523
}
24+
}
2625

27-
var id: ID {
28-
ID(self.request)
26+
struct Waiter {
27+
var requestID: RequestID {
28+
RequestID(self.request)
2929
}
3030

31-
var request: HTTPScheduledRequest {
32-
didSet {
33-
self.updateEventLoopRequirement()
31+
var request: HTTPScheduledRequest
32+
33+
private var eventLoopRequirement: EventLoop? {
34+
switch self.request.eventLoopPreference.preference {
35+
case .delegateAndChannel(on: let eventLoop),
36+
.testOnly_exact(channelOn: let eventLoop, delegateOn: _):
37+
return eventLoop
38+
case .delegate(on: _),
39+
.indifferent:
40+
return nil
3441
}
3542
}
3643

37-
private var eventLoopRequirement: EventLoop?
38-
3944
init(request: HTTPScheduledRequest) {
4045
self.request = request
41-
self.updateEventLoopRequirement()
4246
}
4347

4448
func canBeRun(on option: EventLoop) -> Bool {
@@ -49,16 +53,5 @@ extension HTTPConnectionPool {
4953

5054
return requirement === option
5155
}
52-
53-
private mutating func updateEventLoopRequirement() {
54-
switch self.request.eventLoopPreference.preference {
55-
case .delegateAndChannel(on: let eventLoop),
56-
.testOnly_exact(channelOn: let eventLoop, delegateOn: _):
57-
self.eventLoopRequirement = eventLoop
58-
case .delegate(on: _),
59-
.indifferent:
60-
self.eventLoopRequirement = nil
61-
}
62-
}
6356
}
6457
}

0 commit comments

Comments
 (0)