Skip to content

Commit 805c934

Browse files
dnadobadnadoba
committed
move length parameter to the end
1 parent d9a9658 commit 805c934

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ extension HTTPClientRequest.Body {
7777

7878
@inlinable
7979
public static func bytes<Bytes: Sequence>(
80-
length: Length,
81-
_ bytes: Bytes
80+
_ bytes: Bytes,
81+
length: Length
8282
) -> Self where Bytes.Element == UInt8 {
8383
self.init(.sequence(
8484
length: length.storage,
@@ -95,8 +95,8 @@ extension HTTPClientRequest.Body {
9595

9696
@inlinable
9797
public static func bytes<Bytes: Collection>(
98-
length: Length,
99-
_ bytes: Bytes
98+
_ bytes: Bytes,
99+
length: Length
100100
) -> Self where Bytes.Element == UInt8 {
101101
self.init(.sequence(
102102
length: length.storage,
@@ -113,8 +113,8 @@ extension HTTPClientRequest.Body {
113113

114114
@inlinable
115115
public static func stream<SequenceOfBytes: AsyncSequence>(
116-
length: Length,
117-
_ sequenceOfBytes: SequenceOfBytes
116+
_ sequenceOfBytes: SequenceOfBytes,
117+
length: Length
118118
) -> Self where SequenceOfBytes.Element == ByteBuffer {
119119
var iterator = sequenceOfBytes.makeAsyncIterator()
120120
let body = self.init(.asyncSequence(length: length.storage) { _ -> ByteBuffer? in
@@ -125,8 +125,8 @@ extension HTTPClientRequest.Body {
125125

126126
@inlinable
127127
public static func stream<Bytes: AsyncSequence>(
128-
length: Length,
129-
_ bytes: Bytes
128+
_ bytes: Bytes,
129+
length: Length
130130
) -> Self where Bytes.Element == UInt8 {
131131
var iterator = bytes.makeAsyncIterator()
132132
let body = self.init(.asyncSequence(length: length.storage) { allocator -> ByteBuffer? in

‎Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
115115
let logger = Logger(label: "HTTPClient", factory: StreamLogHandler.standardOutput(label:))
116116
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
117117
request.method = .POST
118-
request.body = .bytes(length: .unknown, AnySequence("1234".utf8))
118+
request.body = .bytes(AnySequence("1234".utf8), length: .unknown)
119119

120120
guard let response = await XCTAssertNoThrowWithResult(
121121
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -140,7 +140,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
140140
let logger = Logger(label: "HTTPClient", factory: StreamLogHandler.standardOutput(label:))
141141
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
142142
request.method = .POST
143-
request.body = .bytes(length: .unknown, AnyCollection("1234".utf8))
143+
request.body = .bytes(AnyCollection("1234".utf8), length: .unknown)
144144

145145
guard let response = await XCTAssertNoThrowWithResult(
146146
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -190,11 +190,11 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
190190
let logger = Logger(label: "HTTPClient", factory: StreamLogHandler.standardOutput(label:))
191191
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
192192
request.method = .POST
193-
request.body = .stream(length: .unknown, [
193+
request.body = .stream([
194194
ByteBuffer(string: "1"),
195195
ByteBuffer(string: "2"),
196196
ByteBuffer(string: "34"),
197-
].asAsyncSequence())
197+
].asAsyncSequence(), length: .unknown)
198198

199199
guard let response = await XCTAssertNoThrowWithResult(
200200
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -219,7 +219,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
219219
let logger = Logger(label: "HTTPClient", factory: StreamLogHandler.standardOutput(label:))
220220
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
221221
request.method = .POST
222-
request.body = .stream(length: .unknown, "1234".utf8.asAsyncSequence())
222+
request.body = .stream("1234".utf8.asAsyncSequence(), length: .unknown)
223223

224224
guard let response = await XCTAssertNoThrowWithResult(
225225
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -245,7 +245,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
245245
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
246246
request.method = .POST
247247
let streamWriter = AsyncSequenceWriter<ByteBuffer>()
248-
request.body = .stream(length: .unknown, streamWriter)
248+
request.body = .stream(streamWriter, length: .unknown)
249249

250250
guard let response = await XCTAssertNoThrowWithResult(
251251
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -287,7 +287,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
287287
var request = HTTPClientRequest(url: "https://localhost:\(bin.port)/")
288288
request.method = .POST
289289
let streamWriter = AsyncSequenceWriter<ByteBuffer>()
290-
request.body = .stream(length: .unknown, streamWriter)
290+
request.body = .stream(streamWriter, length: .unknown)
291291

292292
guard let response = await XCTAssertNoThrowWithResult(
293293
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -330,7 +330,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
330330
var request = HTTPClientRequest(url: "http://localhost:\(bin.port)/offline")
331331
request.method = .POST
332332
let streamWriter = AsyncSequenceWriter<ByteBuffer>()
333-
request.body = .stream(length: .unknown, streamWriter)
333+
request.body = .stream(streamWriter, length: .unknown)
334334

335335
let task = Task<HTTPClientResponse, Error> { [request] in
336336
try await client.execute(request, deadline: .now() + .seconds(2), logger: logger)

‎Tests/AsyncHTTPClientTests/HTTPClientRequestTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class HTTPClientRequestTests: XCTestCase {
297297
var request = Request(url: "http://example.com/post")
298298
request.method = .POST
299299
let sequence = AnySequence(ByteBuffer(string: "post body").readableBytesView)
300-
request.body = .bytes(length: .unknown, sequence)
300+
request.body = .bytes(sequence, length: .unknown)
301301
var preparedRequest: PreparedRequest?
302302
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
303303
guard let preparedRequest = preparedRequest else { return }
@@ -334,7 +334,7 @@ class HTTPClientRequestTests: XCTestCase {
334334
request.method = .POST
335335

336336
let sequence = AnySequence(ByteBuffer(string: "post body").readableBytesView)
337-
request.body = .bytes(length: .known(9), sequence)
337+
request.body = .bytes(sequence, length: .known(9))
338338
var preparedRequest: PreparedRequest?
339339
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
340340
guard let preparedRequest = preparedRequest else { return }
@@ -411,7 +411,7 @@ class HTTPClientRequestTests: XCTestCase {
411411
.asAsyncSequence()
412412
.map { ByteBuffer($0) }
413413

414-
request.body = .stream(length: .unknown, asyncSequence)
414+
request.body = .stream(asyncSequence, length: .unknown)
415415
var preparedRequest: PreparedRequest?
416416
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
417417
guard let preparedRequest = preparedRequest else { return }
@@ -452,7 +452,7 @@ class HTTPClientRequestTests: XCTestCase {
452452
.asAsyncSequence()
453453
.map { ByteBuffer($0) }
454454

455-
request.body = .stream(length: .known(9), asyncSequence)
455+
request.body = .stream(asyncSequence, length: .known(9))
456456
var preparedRequest: PreparedRequest?
457457
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
458458
guard let preparedRequest = preparedRequest else { return }

‎Tests/AsyncHTTPClientTests/TransactionTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ final class TransactionTests: XCTestCase {
189189

190190
var request = HTTPClientRequest(url: "https://localhost/")
191191
request.method = .POST
192-
request.body = .stream(length: .unknown, streamWriter)
192+
request.body = .stream(streamWriter, length: .unknown)
193193

194194
var maybePreparedRequest: PreparedRequest?
195195
XCTAssertNoThrow(maybePreparedRequest = try PreparedRequest(request))
@@ -318,7 +318,7 @@ final class TransactionTests: XCTestCase {
318318

319319
var request = HTTPClientRequest(url: "https://localhost/")
320320
request.method = .POST
321-
request.body = .bytes(length: .unknown, "Hello world!".utf8)
321+
request.body = .bytes("Hello world!".utf8, length: .unknown)
322322
var maybePreparedRequest: PreparedRequest?
323323
XCTAssertNoThrow(maybePreparedRequest = try PreparedRequest(request))
324324
guard let preparedRequest = maybePreparedRequest else {
@@ -360,7 +360,7 @@ final class TransactionTests: XCTestCase {
360360

361361
var request = HTTPClientRequest(url: "https://localhost/")
362362
request.method = .POST
363-
request.body = .stream(length: .unknown, writer)
363+
request.body = .stream(writer, length: .unknown)
364364
var maybePreparedRequest: PreparedRequest?
365365
XCTAssertNoThrow(maybePreparedRequest = try PreparedRequest(request))
366366
guard let preparedRequest = maybePreparedRequest else {
@@ -486,7 +486,7 @@ final class TransactionTests: XCTestCase {
486486
var request = HTTPClientRequest(url: "https://localhost:\(httpBin.port)/")
487487
request.method = .POST
488488
request.headers = ["host": "localhost:\(httpBin.port)"]
489-
request.body = .stream(length: .known(800), streamWriter)
489+
request.body = .stream(streamWriter, length: .known(800))
490490

491491
var maybePreparedRequest: PreparedRequest?
492492
XCTAssertNoThrow(maybePreparedRequest = try PreparedRequest(request))

0 commit comments

Comments
 (0)