Browse Source

Use {request,response}{s,stream} consistently (#1320)

Motivation:

Some of the new async-await APIs are inconsistent in their use of
'requests' vs 'requestStream' and 'responses' vs 'responseStream'. We
should name things consistently.

Modifications:

- Rename 'requests' to 'requestStream' in generated server code
- Rename 'responses' to 'responseStream' in client calls

Result:

More consistent naming.
George Barnett 4 years ago
parent
commit
a405465927
1 changed files with 6 additions and 4 deletions
  1. 6 4
      Sources/protoc-gen-grpc-swift/Generator-Server+AsyncAwait.swift

+ 6 - 4
Sources/protoc-gen-grpc-swift/Generator-Server+AsyncAwait.swift

@@ -59,7 +59,7 @@ extension Generator {
 
     case .clientStreaming:
       arguments = [
-        "requests: \(Types.requestStream(of: self.methodInputName))",
+        "requestStream: \(Types.requestStream(of: self.methodInputName))",
         "context: \(Types.serverContext)",
       ]
       returnType = self.methodOutputName
@@ -74,7 +74,7 @@ extension Generator {
 
     case .bidirectionalStreaming:
       arguments = [
-        "requests: \(Types.requestStream(of: self.methodInputName))",
+        "requestStream: \(Types.requestStream(of: self.methodInputName))",
         "responseStream: \(Types.responseStreamWriter(of: self.methodOutputName))",
         "context: \(Types.serverContext)",
       ]
@@ -145,13 +145,15 @@ extension Generator {
                 self.println("wrapping: self.\(functionName)(request:context:)")
 
               case .clientStreaming:
-                self.println("wrapping: self.\(functionName)(requests:context:)")
+                self.println("wrapping: self.\(functionName)(requestStream:context:)")
 
               case .serverStreaming:
                 self.println("wrapping: self.\(functionName)(request:responseStream:context:)")
 
               case .bidirectionalStreaming:
-                self.println("wrapping: self.\(functionName)(requests:responseStream:context:)")
+                self.println(
+                  "wrapping: self.\(functionName)(requestStream:responseStream:context:)"
+                )
               }
             }
           }