Browse Source

QuickProto: rename the "serialize" method of Message to "data"

Tim Burks 9 years ago
parent
commit
494669ba1b

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

@@ -39,7 +39,7 @@ class EchoServer {
             requestMessage.forOneField("text") {(field) in
               let replyMessage = fileDescriptorSet.createMessage("EchoResponse")!
               replyMessage.addField("text", value:"Swift nonstreaming echo " + field.string())
-              requestHandler.sendResponse(message:replyMessage.serialize(),
+              requestHandler.sendResponse(message:replyMessage.data(),
                                           trailingMetadata:Metadata())
             }
           }
@@ -78,7 +78,7 @@ class EchoServer {
           requestMessage.forOneField("text") {(field) in
             let replyMessage = fileDescriptorSet.createMessage("EchoResponse")!
             replyMessage.addField("text", value:"Swift streaming echo " + field.string())
-            requestHandler.sendResponse(message:replyMessage.serialize()) {
+            requestHandler.sendResponse(message:replyMessage.data()) {
               // after we've sent our response, prepare to handle another message
               self.handleMessage(fileDescriptorSet:fileDescriptorSet, requestHandler:requestHandler)
             }

+ 2 - 2
Examples/Echo/Swift/Echo/EchoViewController.swift

@@ -89,7 +89,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
       // NONSTREAMING
       if let requestMessage = self.fileDescriptorSet.createMessage("EchoRequest") {
         requestMessage.addField("text", value:self.messageField.stringValue)
-        let requestMessageData = requestMessage.serialize()
+        let requestMessageData = requestMessage.data()
 
         client = Client(address:address)
         call = client.createCall(host: requestHost,
@@ -136,7 +136,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
   func sendMessage() {
     let requestMessage = self.fileDescriptorSet.createMessage("EchoRequest")!
     requestMessage.addField("text", value:self.messageField.stringValue)
-    let messageData = requestMessage.serialize()
+    let messageData = requestMessage.data()
     call.sendMessage(data:messageData)
   }
 

+ 1 - 1
Examples/StickyNotes/StickyNotes/StickyNoteViewController.swift

@@ -79,7 +79,7 @@ class StickyNoteViewController : NSViewController, NSTextFieldDelegate {
 
       client = Client(address:address)
       let call = client.createCall(host: requestHost, method: requestMethod, timeout: 600)
-      call.performNonStreamingCall(messageData: requestMessage.serialize(),
+      call.performNonStreamingCall(messageData: requestMessage.data(),
                                    metadata: requestMetadata,
                                    completion:
         { (response) in

+ 1 - 1
Examples/StickyNotes/StickyNotes/StickyServer.swift

@@ -77,7 +77,7 @@ class StickyServer {
 
                 let replyMessage = fileDescriptorSet.createMessage("StickyNoteResponse")!
                 replyMessage.addField("image", value:imageData)
-                requestHandler.sendResponse(message:replyMessage.serialize(),
+                requestHandler.sendResponse(message:replyMessage.data(),
                                             trailingMetadata:Metadata())
               }
             }

+ 3 - 3
Packages/QuickProto/Sources/Message.swift

@@ -136,8 +136,8 @@ public class Message {
     }
   }
 
-  /// generate the serialized protocol buffer representation of a message
-  public func serialize() -> (Data) {
+  /// generate the binary protocol buffer representation of a message
+  public func data() -> (Data) {
     let data = NSMutableData()
     for field in fields {
       data.appendVarint(field.tag() << 3 + field.wireType().rawValue)
@@ -166,7 +166,7 @@ public class Message {
       case FieldType.GROUP:
         assert(false)
       case FieldType.MESSAGE:
-        let messageData = field.message().serialize()
+        let messageData = field.message().data()
         data.appendVarint(messageData.count)
         messageData.withUnsafeBytes({ (bytes) in
           data.append(bytes, length: messageData.count)

+ 1 - 1
QuickProto/QuickProtoTests/QuickProtoTests.swift

@@ -111,7 +111,7 @@ class QuickProtoTests: XCTestCase {
         message.addField("si64") {(field) in field.setInt(-123)}
 
         // serialize the message as a binary protocol buffer
-        let data = message.serialize()
+        let data = message.data()
 
         // re-read it and check fields
         let message2 = fileDescriptorSet.readMessage("SampleMessage", data:data)!