diff --git a/Libraries/Connect/Implementation/Interceptors/ConnectInterceptor.swift b/Libraries/Connect/Implementation/Interceptors/ConnectInterceptor.swift index 8002f86c..99781187 100644 --- a/Libraries/Connect/Implementation/Interceptors/ConnectInterceptor.swift +++ b/Libraries/Connect/Implementation/Interceptors/ConnectInterceptor.swift @@ -118,7 +118,7 @@ extension ConnectInterceptor: Interceptor { requestDataFunction: { data in return Envelope.packMessage(data, using: self.config.requestCompression) }, - streamResultFunc: { result in + streamResultFunction: { result in switch result { case .headers(let headers): responseHeaders = headers diff --git a/Libraries/Connect/Implementation/Interceptors/GRPCWebInterceptor.swift b/Libraries/Connect/Implementation/Interceptors/GRPCWebInterceptor.swift index a87e6fa4..b727f903 100644 --- a/Libraries/Connect/Implementation/Interceptors/GRPCWebInterceptor.swift +++ b/Libraries/Connect/Implementation/Interceptors/GRPCWebInterceptor.swift @@ -123,7 +123,7 @@ extension GRPCWebInterceptor: Interceptor { requestDataFunction: { data in return Envelope.packMessage(data, using: self.config.requestCompression) }, - streamResultFunc: { result in + streamResultFunction: { result in switch result { case .headers(let headers): if let grpcCode = headers.grpcStatus() { diff --git a/Libraries/Connect/Implementation/Interceptors/InterceptorChain.swift b/Libraries/Connect/Implementation/Interceptors/InterceptorChain.swift index 3613df5c..00a8bb54 100644 --- a/Libraries/Connect/Implementation/Interceptors/InterceptorChain.swift +++ b/Libraries/Connect/Implementation/Interceptors/InterceptorChain.swift @@ -69,9 +69,9 @@ struct InterceptorChain { requestDataFunction: { data in return executeInterceptors(interceptors.map(\.requestDataFunction), initial: data) }, - streamResultFunc: { result in + streamResultFunction: { result in return executeInterceptors( - interceptors.reversed().map(\.streamResultFunc), + interceptors.reversed().map(\.streamResultFunction), initial: result ) } diff --git a/Libraries/Connect/Implementation/ProtocolClient.swift b/Libraries/Connect/Implementation/ProtocolClient.swift index 35932b01..aceca649 100644 --- a/Libraries/Connect/Implementation/ProtocolClient.swift +++ b/Libraries/Connect/Implementation/ProtocolClient.swift @@ -237,7 +237,7 @@ extension ProtocolClient: ProtocolClientInterface { let interceptAndHandleResult: (StreamResult) -> Void = { streamResult in do { - let interceptedResult = chain.streamResultFunc(streamResult) + let interceptedResult = chain.streamResultFunction(streamResult) onResult(try interceptedResult.toTypedResult(using: codec)) } catch let error { // TODO: Should we terminate the stream here? diff --git a/Libraries/Connect/Interfaces/Interceptor.swift b/Libraries/Connect/Interfaces/Interceptor.swift index 42ee02a4..d62b527f 100644 --- a/Libraries/Connect/Interfaces/Interceptor.swift +++ b/Libraries/Connect/Interfaces/Interceptor.swift @@ -53,15 +53,15 @@ public struct UnaryFunction { public struct StreamFunction { public let requestFunction: (HTTPRequest) -> HTTPRequest public let requestDataFunction: (Data) -> Data - public let streamResultFunc: (StreamResult) -> StreamResult + public let streamResultFunction: (StreamResult) -> StreamResult public init( requestFunction: @escaping (HTTPRequest) -> HTTPRequest, requestDataFunction: @escaping (Data) -> Data, - streamResultFunc: @escaping (StreamResult) -> StreamResult + streamResultFunction: @escaping (StreamResult) -> StreamResult ) { self.requestFunction = requestFunction self.requestDataFunction = requestDataFunction - self.streamResultFunc = streamResultFunc + self.streamResultFunction = streamResultFunction } } diff --git a/Tests/ConnectLibraryTests/ConnectTests/InterceptorChainTests.swift b/Tests/ConnectLibraryTests/ConnectTests/InterceptorChainTests.swift index 3ddbfdaf..4f0fd549 100644 --- a/Tests/ConnectLibraryTests/ConnectTests/InterceptorChainTests.swift +++ b/Tests/ConnectLibraryTests/ConnectTests/InterceptorChainTests.swift @@ -83,7 +83,7 @@ private struct MockStreamInterceptor: Interceptor { self.requestDataExpectation.fulfill() return self.outboundMessageData }, - streamResultFunc: { result in + streamResultFunction: { result in self.resultExpectation.fulfill() switch result { case .headers(let headers): @@ -208,21 +208,21 @@ final class InterceptorChainTests: XCTestCase { let interceptedRequestData = chain.requestDataFunction(Data()) XCTAssertEqual(interceptedRequestData, filterBData) - switch chain.streamResultFunc(.headers(Headers())) { + switch chain.streamResultFunction(.headers(Headers())) { case .headers(let interceptedResultHeaders): XCTAssertEqual(interceptedResultHeaders["filter-chain"], ["filter-b", "filter-a"]) case .message, .complete: XCTFail("Unexpected result") } - switch chain.streamResultFunc(.message(Data())) { + switch chain.streamResultFunction(.message(Data())) { case .message(let interceptedData): XCTAssertEqual(interceptedData, filterAData) case .headers, .complete: XCTFail("Unexpected result") } - switch chain.streamResultFunc(.complete(code: .ok, error: nil, trailers: nil)) { + switch chain.streamResultFunction(.complete(code: .ok, error: nil, trailers: nil)) { case .complete(_, _, let interceptedTrailers): XCTAssertEqual(interceptedTrailers?["filter-chain"], ["filter-b", "filter-a"]) case .headers, .message: diff --git a/Tests/ConnectLibraryTests/ConnectTests/ProtocolClientConfigTests.swift b/Tests/ConnectLibraryTests/ConnectTests/ProtocolClientConfigTests.swift index 908e635a..fa155951 100644 --- a/Tests/ConnectLibraryTests/ConnectTests/ProtocolClientConfigTests.swift +++ b/Tests/ConnectLibraryTests/ConnectTests/ProtocolClientConfigTests.swift @@ -25,7 +25,7 @@ private struct NoopInterceptor: Interceptor { return .init( requestFunction: { $0 }, requestDataFunction: { $0 }, - streamResultFunc: { $0 } + streamResultFunction: { $0 } ) }