Skip to content

Commit e140e5d

Browse files
dnadobadnadoba
committed
rename .dynamic to .unkown
1 parent b56b4c8 commit e140e5d

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ extension Optional where Wrapped == HTTPClientRequest.Body {
159159
extension HTTPClientRequest.Body {
160160
public struct Length {
161161
/// size of the request body is not known before starting the request
162-
public static let dynamic: Self = .init(storage: .dynamic)
162+
public static let unknown: Self = .init(storage: .unknown)
163163
/// size of the request body is fixed and exactly `count` bytes
164164
public static func fixed(_ count: Int) -> Self {
165165
.init(storage: .fixed(count))

‎Sources/AsyncHTTPClient/ConnectionPool/RequestBodyLength.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@usableFromInline
1717
internal enum RequestBodyLength: Hashable {
1818
/// size of the request body is not known before starting the request
19-
case dynamic
19+
case unknown
2020
/// size of the request body is fixed and exactly `count` bytes
2121
case fixed(_ count: Int)
2222
}

‎Sources/AsyncHTTPClient/HTTPHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ extension RequestBodyLength {
687687
return
688688
}
689689
guard let length = body.length else {
690-
self = .dynamic
690+
self = .unknown
691691
return
692692
}
693693
self = .fixed(length)

‎Sources/AsyncHTTPClient/RequestValidation.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension HTTPHeaders {
2626
switch bodyLength {
2727
case .fixed(0):
2828
break
29-
case .dynamic, .fixed:
29+
case .unknown, .fixed:
3030
// A client MUST NOT send a message body in a TRACE request.
3131
// https://tools.ietf.org/html/rfc7230#section-4.3.8
3232
throw HTTPClientError.traceRequestWithBody
@@ -37,7 +37,7 @@ extension HTTPHeaders {
3737

3838
let connectionClose = self[canonicalForm: "connection"].lazy.map { $0.lowercased() }.contains("close")
3939
switch bodyLength {
40-
case .dynamic:
40+
case .unknown:
4141
return .init(connectionClose: connectionClose, body: .stream)
4242
case .fixed(let length):
4343
return .init(connectionClose: connectionClose, body: .fixedSize(length))
@@ -105,7 +105,7 @@ extension HTTPHeaders {
105105
}
106106
case .fixed(let length):
107107
self.add(name: "Content-Length", value: String(length))
108-
case .dynamic:
108+
case .unknown:
109109
self.add(name: "Transfer-Encoding", value: "chunked")
110110
}
111111
}

‎Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

Lines changed: 7 additions & 7 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: .dynamic, AnySequence("1234".utf8))
118+
request.body = .bytes(length: .unknown, AnySequence("1234".utf8))
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: .dynamic, AnyCollection("1234".utf8))
143+
request.body = .bytes(length: .unknown, AnyCollection("1234".utf8))
144144

145145
guard let response = await XCTAssertNoThrowWithResult(
146146
try await client.execute(request, deadline: .now() + .seconds(10), logger: logger)
@@ -190,7 +190,7 @@ 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: .dynamic, [
193+
request.body = .stream(length: .unknown, [
194194
ByteBuffer(string: "1"),
195195
ByteBuffer(string: "2"),
196196
ByteBuffer(string: "34"),
@@ -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: .dynamic, "1234".utf8.asAsyncSequence())
222+
request.body = .stream(length: .unknown, "1234".utf8.asAsyncSequence())
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: .dynamic, streamWriter)
248+
request.body = .stream(length: .unknown, streamWriter)
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: .dynamic, streamWriter)
290+
request.body = .stream(length: .unknown, streamWriter)
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: .dynamic, streamWriter)
333+
request.body = .stream(length: .unknown, streamWriter)
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: 2 additions & 2 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: .dynamic, sequence)
300+
request.body = .bytes(length: .unknown, sequence)
301301
var preparedRequest: PreparedRequest?
302302
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
303303
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: .dynamic, asyncSequence)
414+
request.body = .stream(length: .unknown, asyncSequence)
415415
var preparedRequest: PreparedRequest?
416416
XCTAssertNoThrow(preparedRequest = try PreparedRequest(request))
417417
guard let preparedRequest = preparedRequest else { return }

‎Tests/AsyncHTTPClientTests/RequestValidationTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class RequestValidationTests: XCTestCase {
149149
for method: HTTPMethod in [.GET, .HEAD, .DELETE, .CONNECT] {
150150
var headers: HTTPHeaders = .init()
151151
var metadata: RequestFramingMetadata?
152-
XCTAssertNoThrow(metadata = try headers.validateAndSetTransportFraming(method: method, bodyLength: .dynamic))
152+
XCTAssertNoThrow(metadata = try headers.validateAndSetTransportFraming(method: method, bodyLength: .unknown))
153153
XCTAssertTrue(headers["content-length"].isEmpty)
154154
XCTAssertTrue(headers["transfer-encoding"].contains("chunked"))
155155
XCTAssertEqual(metadata?.body, .stream)
@@ -169,7 +169,7 @@ class RequestValidationTests: XCTestCase {
169169
for method: HTTPMethod in [.POST, .PUT] {
170170
var headers: HTTPHeaders = .init()
171171
var metadata: RequestFramingMetadata?
172-
XCTAssertNoThrow(metadata = try headers.validateAndSetTransportFraming(method: method, bodyLength: .dynamic))
172+
XCTAssertNoThrow(metadata = try headers.validateAndSetTransportFraming(method: method, bodyLength: .unknown))
173173
XCTAssertTrue(headers["content-length"].isEmpty)
174174
XCTAssertTrue(headers["transfer-encoding"].contains("chunked"))
175175
XCTAssertEqual(metadata?.body, .stream)
@@ -330,7 +330,7 @@ class RequestValidationTests: XCTestCase {
330330

331331
func testTraceMethodIsNotAllowedToHaveADynamicLengthBody() {
332332
var headers = HTTPHeaders()
333-
XCTAssertThrowsError(try headers.validateAndSetTransportFraming(method: .TRACE, bodyLength: .dynamic)) {
333+
XCTAssertThrowsError(try headers.validateAndSetTransportFraming(method: .TRACE, bodyLength: .unknown)) {
334334
XCTAssertEqual($0 as? HTTPClientError, .traceRequestWithBody)
335335
}
336336
}
@@ -349,7 +349,7 @@ class RequestValidationTests: XCTestCase {
349349
var headers: HTTPHeaders = [
350350
"Transfer-Encoding": "gzip, chunked",
351351
]
352-
XCTAssertNoThrow(try headers.validateAndSetTransportFraming(method: .POST, bodyLength: .dynamic))
352+
XCTAssertNoThrow(try headers.validateAndSetTransportFraming(method: .POST, bodyLength: .unknown))
353353
XCTAssertEqual(headers, [
354354
"Transfer-Encoding": "chunked",
355355
])

‎Tests/AsyncHTTPClientTests/TransactionTests.swift

Lines changed: 3 additions & 3 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: .dynamic, streamWriter)
192+
request.body = .stream(length: .unknown, streamWriter)
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: .dynamic, "Hello world!".utf8)
321+
request.body = .bytes(length: .unknown, "Hello world!".utf8)
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: .dynamic, writer)
363+
request.body = .stream(length: .unknown, writer)
364364
var maybePreparedRequest: PreparedRequest?
365365
XCTAssertNoThrow(maybePreparedRequest = try PreparedRequest(request))
366366
guard let preparedRequest = maybePreparedRequest else {

0 commit comments

Comments
 (0)