Explorar el Código

Reformat with 6.2 formatter (#135)

George Barnett hace 3 meses
padre
commit
e87ef6bc37

+ 15 - 12
Sources/GRPCNIOTransportCore/Server/CommonHTTP2ServerTransport.swift

@@ -154,10 +154,11 @@ package final class CommonHTTP2ServerTransport<
   }
 
   package func listen(
-    streamHandler: @escaping @Sendable (
-      _ stream: RPCStream<Inbound, Outbound>,
-      _ context: ServerContext
-    ) async -> Void
+    streamHandler:
+      @escaping @Sendable (
+        _ stream: RPCStream<Inbound, Outbound>,
+        _ context: ServerContext
+      ) async -> Void
   ) async throws {
     defer {
       switch self.listeningAddressState.withLock({ $0.close() }) {
@@ -205,10 +206,11 @@ package final class CommonHTTP2ServerTransport<
   private func handleConnection(
     _ connection: NIOAsyncChannel<HTTP2Frame, HTTP2Frame>,
     multiplexer: ChannelPipeline.SynchronousOperations.HTTP2StreamMultiplexer,
-    streamHandler: @escaping @Sendable (
-      _ stream: RPCStream<Inbound, Outbound>,
-      _ context: ServerContext
-    ) async -> Void
+    streamHandler:
+      @escaping @Sendable (
+        _ stream: RPCStream<Inbound, Outbound>,
+        _ context: ServerContext
+      ) async -> Void
   ) async throws {
     let remotePeer = connection.channel.remoteAddressInfo
     let localPeer = connection.channel.localAddressInfo
@@ -246,10 +248,11 @@ package final class CommonHTTP2ServerTransport<
   private func handleStream(
     _ stream: NIOAsyncChannel<RPCRequestPart<Bytes>, RPCResponsePart<Bytes>>,
     _ connection: NIOAsyncChannel<HTTP2Frame, HTTP2Frame>,
-    handler streamHandler: @escaping @Sendable (
-      _ stream: RPCStream<Inbound, Outbound>,
-      _ context: ServerContext
-    ) async -> Void,
+    handler streamHandler:
+      @escaping @Sendable (
+        _ stream: RPCStream<Inbound, Outbound>,
+        _ context: ServerContext
+      ) async -> Void,
     descriptor: EventLoopFuture<MethodDescriptor>,
     remotePeer: String,
     localPeer: String

+ 5 - 4
Sources/GRPCNIOTransportHTTP2Posix/HTTP2ServerTransport+Posix.swift

@@ -212,10 +212,11 @@ extension HTTP2ServerTransport {
     }
 
     public func listen(
-      streamHandler: @escaping @Sendable (
-        _ stream: RPCStream<Inbound, Outbound>,
-        _ context: ServerContext
-      ) async -> Void
+      streamHandler:
+        @escaping @Sendable (
+          _ stream: RPCStream<Inbound, Outbound>,
+          _ context: ServerContext
+        ) async -> Void
     ) async throws {
       try await self.underlyingTransport.listen(streamHandler: streamHandler)
     }

+ 5 - 4
Sources/GRPCNIOTransportHTTP2TransportServices/HTTP2ServerTransport+TransportServices.swift

@@ -133,10 +133,11 @@ extension HTTP2ServerTransport {
     }
 
     public func listen(
-      streamHandler: @escaping @Sendable (
-        _ stream: RPCStream<Inbound, Outbound>,
-        _ context: ServerContext
-      ) async -> Void
+      streamHandler:
+        @escaping @Sendable (
+          _ stream: RPCStream<Inbound, Outbound>,
+          _ context: ServerContext
+        ) async -> Void
     ) async throws {
       try await self.underlyingTransport.listen(streamHandler: streamHandler)
     }

+ 8 - 6
Tests/GRPCNIOTransportHTTP2Tests/ControlClient.swift

@@ -93,9 +93,10 @@ internal struct ControlClient<Transport> where Transport: ClientTransport {
   internal func waitForCancellation<R>(
     request: GRPCCore.ClientRequest<CancellationKind>,
     options: GRPCCore.CallOptions = .defaults,
-    _ body: @Sendable @escaping (
-      _ response: GRPCCore.StreamingClientResponse<CancellationKind>
-    ) async throws -> R
+    _ body:
+      @Sendable @escaping (
+        _ response: GRPCCore.StreamingClientResponse<CancellationKind>
+      ) async throws -> R
   ) async throws -> R where R: Sendable {
     try await self.client.serverStreaming(
       request: request,
@@ -109,9 +110,10 @@ internal struct ControlClient<Transport> where Transport: ClientTransport {
 
   internal func peerInfo<R>(
     options: GRPCCore.CallOptions = .defaults,
-    _ body: @Sendable @escaping (
-      _ response: GRPCCore.ClientResponse<ControlService.PeerInfoResponse>
-    ) async throws -> R = { try $0.message }
+    _ body:
+      @Sendable @escaping (
+        _ response: GRPCCore.ClientResponse<ControlService.PeerInfoResponse>
+      ) async throws -> R = { try $0.message }
   ) async throws -> R where R: Sendable {
     try await self.client.unary(
       request: ClientRequest(message: ""),

+ 22 - 12
Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorld.grpc.swift

@@ -15,9 +15,10 @@
  */
 
 import GRPCCore
+
 import struct Foundation.Data
-import class Foundation.JSONEncoder
 import class Foundation.JSONDecoder
+import class Foundation.JSONEncoder
 
 // MARK: - HelloWorld
 
@@ -131,7 +132,9 @@ extension HelloWorld {
 // Default implementation of 'registerMethods(with:)'.
 @available(gRPCSwiftNIOTransport 2.2, *)
 extension HelloWorld.StreamingServiceProtocol {
-  internal func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
+  internal func registerMethods<Transport>(
+    with router: inout GRPCCore.RPCRouter<Transport>
+  ) where Transport: GRPCCore.ServerTransport {
     router.registerHandler(
       forMethod: HelloWorld.Method.sayHello.descriptor,
       deserializer: JSONDeserializer<HelloRequest>(),
@@ -203,7 +206,8 @@ extension HelloWorld {
       serializer: some GRPCCore.MessageSerializer<HelloRequest>,
       deserializer: some GRPCCore.MessageDeserializer<HelloResponse>,
       options: GRPCCore.CallOptions,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result
+      onResponse handleResponse:
+        @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result
     ) async throws -> Result where Result: Sendable
   }
 
@@ -239,9 +243,11 @@ extension HelloWorld {
       serializer: some GRPCCore.MessageSerializer<HelloRequest>,
       deserializer: some GRPCCore.MessageDeserializer<HelloResponse>,
       options: GRPCCore.CallOptions = .defaults,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = { response in
-        try response.message
-      }
+      onResponse handleResponse:
+        @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = {
+          response in
+          try response.message
+        }
     ) async throws -> Result where Result: Sendable {
       try await self.client.unary(
         request: request,
@@ -270,9 +276,11 @@ extension HelloWorld.ClientProtocol {
   internal func sayHello<Result>(
     request: GRPCCore.ClientRequest<HelloRequest>,
     options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = { response in
-      try response.message
-    }
+    onResponse handleResponse:
+      @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = {
+        response in
+        try response.message
+      }
   ) async throws -> Result where Result: Sendable {
     try await self.sayHello(
       request: request,
@@ -301,9 +309,11 @@ extension HelloWorld.ClientProtocol {
     _ message: HelloRequest,
     metadata: GRPCCore.Metadata = [:],
     options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = { response in
-      try response.message
-    }
+    onResponse handleResponse:
+      @Sendable @escaping (GRPCCore.ClientResponse<HelloResponse>) async throws -> Result = {
+        response in
+        try response.message
+      }
   ) async throws -> Result where Result: Sendable {
     let request = GRPCCore.ClientRequest<HelloRequest>(
       message: message,

+ 5 - 4
Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorldService.swift

@@ -25,10 +25,11 @@ struct HelloWorldService: HelloWorld.SimpleServiceProtocol {
     ) async throws -> HelloResponse
 
   init(
-    implementation: @Sendable @escaping (
-      _: HelloRequest,
-      _: ServerContext
-    ) async throws -> HelloResponse
+    implementation:
+      @Sendable @escaping (
+        _: HelloRequest,
+        _: ServerContext
+      ) async throws -> HelloResponse
   ) {
     self.implementation = implementation
   }

+ 5 - 4
Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/TransportKind.swift

@@ -173,10 +173,11 @@ enum NIOServerTransport: ServerTransport, ListeningServerTransport {
   }
 
   func listen(
-    streamHandler: @escaping @Sendable (
-      _ stream: RPCStream<Inbound, Outbound>,
-      _ context: ServerContext
-    ) async -> Void
+    streamHandler:
+      @escaping @Sendable (
+        _ stream: RPCStream<Inbound, Outbound>,
+        _ context: ServerContext
+      ) async -> Void
   ) async throws {
     switch self {
     case .posix(let transport):