Bladeren bron

remove ByteBuffer from Handler interface

Tim Burks 9 jaren geleden
bovenliggende
commit
7bbe43fe05
2 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 4 4
      Examples/Echo/Swift/Echo/EchoServer.swift
  2. 4 4
      Packages/gRPC/Sources/Handler.swift

+ 4 - 4
Examples/Echo/Swift/Echo/EchoServer.swift

@@ -73,14 +73,14 @@ class EchoServer {
   func handleMessage(fileDescriptorSet: FileDescriptorSet,
                      requestHandler: Handler) {
     requestHandler.receiveMessage()
-      {(requestBuffer) in
-        if let requestBuffer = requestBuffer,
+      {(requestData) in
+        if let requestData = requestData,
           let requestMessage = fileDescriptorSet.readMessage(name:"EchoRequest",
-                                                             proto:requestBuffer.data()) {
+                                                             proto:requestData) {
           requestMessage.forOneField(name:"text") {(field) in
             let replyMessage = fileDescriptorSet.createMessage(name:"EchoResponse")!
             replyMessage.addField(name:"text", value:"Swift streaming echo " + field.string())
-            requestHandler.sendResponse(message:ByteBuffer(data:replyMessage.serialize())) {
+            requestHandler.sendResponse(message:replyMessage.serialize()) {
               // after we've sent our response, prepare to handle another message
               self.handleMessage(fileDescriptorSet:fileDescriptorSet, requestHandler:requestHandler)
             }

+ 4 - 4
Packages/gRPC/Sources/Handler.swift

@@ -177,7 +177,7 @@ public class Handler {
   /// Receive the message sent with a call
   ///
   /// - Returns: a tuple containing status codes and a message (if available)
-  public func receiveMessage(completion:((ByteBuffer?) -> Void)) -> Void {
+  public func receiveMessage(completion:((Data?) -> Void)) -> Void {
     let call = self.call()
     let operation_receiveMessage = Operation_ReceiveMessage()
     let operations = OperationGroup(call:call, operations:[operation_receiveMessage])
@@ -185,7 +185,7 @@ public class Handler {
       if (event.type == GRPC_OP_COMPLETE) {
         print("server receiveMessage complete")
         if let message = operation_receiveMessage.message() {
-          completion(message)
+          completion(message.data())
         } else {
           completion(nil)
         }
@@ -202,10 +202,10 @@ public class Handler {
   ///
   /// - Parameter message: the message to send
   /// - Returns: a tuple containing status codes
-  public func sendResponse(message: ByteBuffer,
+  public func sendResponse(message: Data,
                            completion: @escaping () -> Void) -> Void {
     let call = self.call()
-    let operation_sendMessage = Operation_SendMessage(message:message)
+    let operation_sendMessage = Operation_SendMessage(message:ByteBuffer(data:message))
     let operations = OperationGroup(call:call, operations:[operation_sendMessage])
     {(event) in
       print("server sendResponse complete")