Reduce use of HTTPClient.Configuration in the Connection objects (#635)

fabianfett · web-flow · commit af5966f1d1ba · 2022-10-07T08:05:28.000-07:00
diff --git a/Sources/AsyncHTTPClient/ConnectionPool/HTTP1/HTTP1Connection.swift b/Sources/AsyncHTTPClient/ConnectionPool/HTTP1/HTTP1Connection.swift
@@ -57,11 +57,11 @@ final class HTTP1Connection{
 channel: Channel,
 connectionID: HTTPConnectionPool.Connection.ID,
 delegate: HTTP1ConnectionDelegate,
- configuration: HTTPClient.Configuration,
+ decompression: HTTPClient.Decompression,
 logger: Logger
 ) throws -> HTTP1Connection{
 let connection = HTTP1Connection(channel: channel, connectionID: connectionID, delegate: delegate)
- try connection.start(configuration: configuration, logger: logger)
+ try connection.start(decompression: decompression, logger: logger)
 return connection
 }
 
@@ -101,7 +101,7 @@ final class HTTP1Connection{
 self.channel.write(request, promise: nil)
 }
 
- private func start(configuration: HTTPClient.Configuration, logger: Logger) throws{
+ private func start(decompression: HTTPClient.Decompression, logger: Logger) throws{
 self.channel.eventLoop.assertInEventLoop()
 
 guard case .initialized = self.state else{
@@ -127,7 +127,7 @@ final class HTTP1Connection{
 try sync.addHandler(requestEncoder)
 try sync.addHandler(ByteToMessageHandler(responseDecoder))
 
- if case .enabled(let limit) = configuration.decompression{
+ if case .enabled(let limit) = decompression{
 let decompressHandler = NIOHTTPResponseDecompressor(limit: limit)
 try sync.addHandler(decompressHandler)
 }
diff --git a/Sources/AsyncHTTPClient/ConnectionPool/HTTP2/HTTP2Connection.swift b/Sources/AsyncHTTPClient/ConnectionPool/HTTP2/HTTP2Connection.swift
@@ -119,10 +119,16 @@ final class HTTP2Connection{
 channel: Channel,
 connectionID: HTTPConnectionPool.Connection.ID,
 delegate: HTTP2ConnectionDelegate,
- configuration: HTTPClient.Configuration,
+ decompression: HTTPClient.Decompression,
 logger: Logger
 ) -> EventLoopFuture<(HTTP2Connection, Int)>{
- let connection = HTTP2Connection(channel: channel, connectionID: connectionID, decompression: configuration.decompression, delegate: delegate, logger: logger)
+ let connection = HTTP2Connection(
+ channel: channel,
+ connectionID: connectionID,
+ decompression: decompression,
+ delegate: delegate,
+ logger: logger
+ )
 return connection.start().map{maxStreams in (connection, maxStreams) }
 }
 
diff --git a/Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Factory.swift b/Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Factory.swift
@@ -71,7 +71,7 @@ extension HTTPConnectionPool.ConnectionFactory{
 channel: channel,
 connectionID: connectionID,
 delegate: http1ConnectionDelegate,
- configuration: self.clientConfiguration,
+ decompression: self.clientConfiguration.decompression,
 logger: logger
 )
 requester.http1ConnectionCreated(connection)
@@ -83,7 +83,7 @@ extension HTTPConnectionPool.ConnectionFactory{
 channel: channel,
 connectionID: connectionID,
 delegate: http2ConnectionDelegate,
- configuration: self.clientConfiguration,
+ decompression: self.clientConfiguration.decompression,
 logger: logger
 ).whenComplete{result in
 switch result{
@@ -105,41 +105,6 @@ extension HTTPConnectionPool.ConnectionFactory{
 case http2(Channel)
 }
 
- func makeHTTP1Channel<Requester: HTTPConnectionRequester>(
- requester: Requester,
- connectionID: HTTPConnectionPool.Connection.ID,
- deadline: NIODeadline,
- eventLoop: EventLoop,
- logger: Logger
- ) -> EventLoopFuture<Channel>{
- self.makeChannel(
- requester: requester,
- connectionID: connectionID,
- deadline: deadline,
- eventLoop: eventLoop,
- logger: logger
- ).flatMapThrowing{negotiated -> Channel in
-
- guard case .http1_1(let channel) = negotiated else{
- preconditionFailure("Expected to create http/1.1 connections only for now")
- }
-
- // add the http1.1 channel handlers
- let syncOperations = channel.pipeline.syncOperations
- try syncOperations.addHTTPClientHandlers(leftOverBytesStrategy: .forwardBytes)
-
- switch self.clientConfiguration.decompression{
- case .disabled:
- ()
- case .enabled(let limit):
- let decompressHandler = NIOHTTPResponseDecompressor(limit: limit)
- try syncOperations.addHandler(decompressHandler)
- }
-
- return channel
- }
- }
-
 func makeChannel<Requester: HTTPConnectionRequester>(
 requester: Requester,
 connectionID: HTTPConnectionPool.Connection.ID,
diff --git a/Tests/AsyncHTTPClientTests/EmbeddedChannel+HTTPConvenience.swift b/Tests/AsyncHTTPClientTests/EmbeddedChannel+HTTPConvenience.swift
@@ -77,7 +77,7 @@ extension EmbeddedChannel{
 channel: self,
 connectionID: 1,
 delegate: connectionDelegate,
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 )
 
diff --git a/Tests/AsyncHTTPClientTests/HTTP1ConnectionTests.swift b/Tests/AsyncHTTPClientTests/HTTP1ConnectionTests.swift
@@ -35,7 +35,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: MockHTTP1ConnectionDelegate(),
- configuration: .init(decompression: .enabled(limit: .ratio(4))),
+ decompression: .enabled(limit: .ratio(4)),
 logger: logger
 ))
 
@@ -58,7 +58,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: MockHTTP1ConnectionDelegate(),
- configuration: .init(decompression: .disabled),
+ decompression: .disabled,
 logger: logger
 ))
 
@@ -82,7 +82,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: MockHTTP1ConnectionDelegate(),
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ))
 }
@@ -106,7 +106,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: $0,
 connectionID: 0,
 delegate: delegate,
- configuration: .init(decompression: .disabled),
+ decompression: .disabled,
 logger: logger
 )
 }
@@ -206,7 +206,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: XCTUnwrap(maybeChannel),
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ) }.wait())
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection here") }
@@ -260,7 +260,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: XCTUnwrap(maybeChannel),
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ) }.wait())
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection here") }
@@ -332,7 +332,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: XCTUnwrap(maybeChannel),
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ) }.wait())
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection here") }
@@ -377,7 +377,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(decompression: .enabled(limit: .ratio(4))),
+ decompression: .enabled(limit: .ratio(4)),
 logger: logger
 ))
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection at this point.") }
@@ -442,7 +442,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(decompression: .enabled(limit: .ratio(4))),
+ decompression: .enabled(limit: .ratio(4)),
 logger: logger
 ))
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection at this point.") }
@@ -504,7 +504,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(decompression: .enabled(limit: .ratio(4))),
+ decompression: .enabled(limit: .ratio(4)),
 logger: logger
 ))
 
@@ -539,7 +539,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(decompression: .enabled(limit: .ratio(4))),
+ decompression: .enabled(limit: .ratio(4)),
 logger: logger
 ))
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection at this point.") }
@@ -691,7 +691,7 @@ class HTTP1ConnectionTests: XCTestCase{
 channel: channel,
 connectionID: 0,
 delegate: connectionDelegate,
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ) }.wait())
 guard let connection = maybeConnection else{return XCTFail("Expected to have a connection at this point") }
diff --git a/Tests/AsyncHTTPClientTests/HTTP2ConnectionTests.swift b/Tests/AsyncHTTPClientTests/HTTP2ConnectionTests.swift
@@ -37,7 +37,7 @@ class HTTP2ConnectionTests: XCTestCase{
 channel: embedded,
 connectionID: 0,
 delegate: TestHTTP2ConnectionDelegate(),
- configuration: .init(),
+ decompression: .disabled,
 logger: logger
 ).wait())
 }

-Original file line number
+Diff line change
  channel:Channel,
  connectionID:HTTPConnectionPool.Connection.ID,
  delegate:HTTP1ConnectionDelegate,
 -configuration:HTTPClient.Configuration,
 +decompression:HTTPClient.Decompression,
  logger:Logger
 )throws->HTTP1Connection{
 letconnection=HTTP1Connection(channel: channel, connectionID: connectionID, delegate: delegate)
 -try connection.start(configuration: configuration, logger: logger)
 +try connection.start(decompression: decompression, logger: logger)
 return connection
+}
 self.channel.write(request, promise:nil)
+}
 -privatefunc start(configuration:HTTPClient.Configuration, logger:Logger)throws{
 +privatefunc start(decompression:HTTPClient.Decompression, logger:Logger)throws{
 self.channel.eventLoop.assertInEventLoop()
 guard case .initialized =self.state else{
 try sync.addHandler(requestEncoder)
 try sync.addHandler(ByteToMessageHandler(responseDecoder))
 -if case .enabled(let limit)=configuration.decompression {
 +if case .enabled(let limit)= decompression {
 letdecompressHandler=NIOHTTPResponseDecompressor(limit: limit)
 try sync.addHandler(decompressHandler)
+}
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ extension EmbeddedChannel{`
`77`	`77`	`channel:self,`
`78`	`78`	`connectionID:1,`
`79`	`79`	`delegate: connectionDelegate,`
`80`		`-configuration:.init(),`
	`80`	`+decompression:.disabled,`
`81`	`81`	`logger: logger`
`82`	`82`	`)`
`83`	`83`
-Original file line number
+Diff line change
  channel: embedded,
  connectionID:0,
  delegate:MockHTTP1ConnectionDelegate(),
 -configuration:.init(decompression:.enabled(limit:.ratio(4))),
 + decompression:.enabled(limit:.ratio(4)),
  logger: logger
 ))
  channel: embedded,
  connectionID:0,
  delegate:MockHTTP1ConnectionDelegate(),
 -configuration:.init(decompression:.disabled),
 + decompression:.disabled,
  logger: logger
 ))
  channel: embedded,
  connectionID:0,
  delegate:MockHTTP1ConnectionDelegate(),
 -configuration:.init(),
 +decompression:.disabled,
  logger: logger
 ))
+}
  channel: $0,
  connectionID:0,
  delegate: delegate,
 -configuration:.init(decompression:.disabled),
 + decompression:.disabled,
  logger: logger
+)
+}
  channel:XCTUnwrap(maybeChannel),
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(),
 +decompression:.disabled,
  logger: logger
 )}.wait())
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection here")}
  channel:XCTUnwrap(maybeChannel),
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(),
 +decompression:.disabled,
  logger: logger
 )}.wait())
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection here")}
  channel:XCTUnwrap(maybeChannel),
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(),
 +decompression:.disabled,
  logger: logger
 )}.wait())
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection here")}
  channel: embedded,
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(decompression:.enabled(limit:.ratio(4))),
 + decompression:.enabled(limit:.ratio(4)),
  logger: logger
 ))
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection at this point.")}
  channel: embedded,
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(decompression:.enabled(limit:.ratio(4))),
 + decompression:.enabled(limit:.ratio(4)),
  logger: logger
 ))
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection at this point.")}
  channel: embedded,
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(decompression:.enabled(limit:.ratio(4))),
 + decompression:.enabled(limit:.ratio(4)),
  logger: logger
 ))
  channel: embedded,
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(decompression:.enabled(limit:.ratio(4))),
 + decompression:.enabled(limit:.ratio(4)),
  logger: logger
 ))
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection at this point.")}
  channel: channel,
  connectionID:0,
  delegate: connectionDelegate,
 -configuration:.init(),
 +decompression:.disabled,
  logger: logger
 )}.wait())
 guardlet connection = maybeConnection else{returnXCTFail("Expected to have a connection at this point")}
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class HTTP2ConnectionTests: XCTestCase{`
`37`	`37`	`channel: embedded,`
`38`	`38`	`connectionID:0,`
`39`	`39`	`delegate:TestHTTP2ConnectionDelegate(),`
`40`		`-configuration:.init(),`
	`40`	`+decompression:.disabled,`
`41`	`41`	`logger: logger`
`42`	`42`	`).wait())`
`43`	`43`	`}`