Remove redundant RequestFramingMetadata.Body.none case (#480)

Author: dnadoba

Sources/AsyncHTTPClient/ConnectionPool/HTTPRequestStateMachine.swift

@@ -665,13 +665,14 @@ struct HTTPRequestStateMachine {
         case .stream:
             self.state = .running(.streaming(expectedBodyLength: nil, sentBodyBytes: 0, producer: .producing), .waitingForHead)
             return .sendRequestHead(head, startBody: true)
-        case .fixedSize(let length) where length > 0:
-            self.state = .running(.streaming(expectedBodyLength: length, sentBodyBytes: 0, producer: .producing), .waitingForHead)
-            return .sendRequestHead(head, startBody: true)
-        case .none, .fixedSize:
-            // fallback if fixed size is 0
+        case .fixedSize(0):
+            // no body
             self.state = .running(.endSent, .waitingForHead)
             return .sendRequestHead(head, startBody: false)
+        case .fixedSize(let length):
+            // length is greater than zero and we therefore have a body to send
+            self.state = .running(.streaming(expectedBodyLength: length, sentBodyBytes: 0, producer: .producing), .waitingForHead)
+            return .sendRequestHead(head, startBody: true)
         }
     }
 }

Sources/AsyncHTTPClient/ConnectionPool/RequestFramingMetadata.swift

@@ -14,7 +14,6 @@
 
 struct RequestFramingMetadata: Hashable {
     enum Body: Hashable {
-        case none
         case stream
         case fixedSize(Int)
     }

Sources/AsyncHTTPClient/RequestValidation.swift

@@ -17,7 +17,7 @@ import NIOHTTP1
 
 extension HTTPHeaders {
     mutating func validate(method: HTTPMethod, body: HTTPClient.Body?) throws -> RequestFramingMetadata {
-        var metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        var metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
 
         if self[canonicalForm: "connection"].lazy.map({ $0.lowercased() }).contains("close") {
             metadata.connectionClose = true

Tests/AsyncHTTPClientTests/HTTP1ConnectionStateMachineTests.swift

@@ -62,7 +62,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
 
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -90,7 +90,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/", headers: ["connection": "close"])
-        let metadata = RequestFramingMetadata(connectionClose: true, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: true, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -106,7 +106,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -122,7 +122,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -139,7 +139,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         XCTAssertEqual(state.channelActive(isWritable: false), .fireChannelActive)
         XCTAssertEqual(state.writabilityChanged(writable: true), .wait)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -168,7 +168,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
 
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
 
@@ -233,7 +233,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
         let responseHead = HTTPResponseHead(version: .http1_1, status: .ok)
@@ -248,7 +248,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
         let responseHead = HTTPResponseHead(version: .http1_1, status: .switchingProtocols)
@@ -260,7 +260,7 @@ class HTTP1ConnectionStateMachineTests: XCTestCase {
         var state = HTTP1ConnectionStateMachine()
         XCTAssertEqual(state.channelActive(isWritable: true), .fireChannelActive)
         let requestHead = HTTPRequestHead(version: .http1_1, method: .GET, uri: "/")
-        let metadata = RequestFramingMetadata(connectionClose: false, body: .none)
+        let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0))
         let newRequestAction = state.runNewRequest(head: requestHead, metadata: metadata)
         XCTAssertEqual(newRequestAction, .sendRequestHead(requestHead, startBody: false))
         let responseHead = HTTPResponseHead(version: .http1_1, status: .init(statusCode: 103, reasonPhrase: "Early Hints"))