浏览代码

Update Examples to use 0.1.7 generated API.

Tim Burks 9 年之前
父节点
当前提交
4832a7e4df

+ 6 - 6
Examples/Echo/EchoProvider.swift

@@ -45,7 +45,7 @@ class EchoProvider : Echo_EchoProvider {
     let parts = request.text.components(separatedBy: " ")
     var i = 0
     for part in parts {
-      try session.Send(Echo_EchoResponse(text:"Swift echo expand (\(i)): \(part)"))
+      try session.send(Echo_EchoResponse(text:"Swift echo expand (\(i)): \(part)"))
       i += 1
       sleep(1)
     }
@@ -56,7 +56,7 @@ class EchoProvider : Echo_EchoProvider {
     var parts : [String] = []
     while true {
       do {
-        let request = try session.Receive()
+        let request = try session.receive()
         parts.append(request.text)
       } catch Echo_EchoServerError.endOfStream {
         break
@@ -65,7 +65,7 @@ class EchoProvider : Echo_EchoProvider {
       }
     }
     let response = Echo_EchoResponse(text:"Swift echo collect: " + parts.joined(separator: " "))
-    try session.SendAndClose(response)
+    try session.sendAndClose(response)
   }
 
   // update streams back messages as they are received in an input stream.
@@ -73,15 +73,15 @@ class EchoProvider : Echo_EchoProvider {
     var count = 0
     while true {
       do {
-        let request = try session.Receive()
+        let request = try session.receive()
         count += 1
-        try session.Send(Echo_EchoResponse(text:"Swift echo update (\(count)): \(request.text)"))
+        try session.send(Echo_EchoResponse(text:"Swift echo update (\(count)): \(request.text)"))
       } catch Echo_EchoServerError.endOfStream {
         break
       } catch (let error) {
         print("\(error)")
       }
     }
-    try session.Close()
+    try session.close()
   }
 }

+ 6 - 6
Examples/Echo/PackageManager/Sources/main.swift

@@ -131,7 +131,7 @@ if client != "" {
     var running = true
     while running {
       do {
-        let responseMessage = try expandCall.Receive()
+        let responseMessage = try expandCall.receive()
         print("Received: \(responseMessage.text)")
       } catch Echo_EchoClientError.endOfStream {
         print("expand closed")
@@ -148,11 +148,11 @@ if client != "" {
     for part in parts {
       let requestMessage = Echo_EchoRequest(text:part)
       print("Sending: " + part)
-      try collectCall.Send(requestMessage)
+      try collectCall.send(requestMessage)
       sleep(1)
     }
 
-    let responseMessage = try collectCall.CloseAndReceive()
+    let responseMessage = try collectCall.closeAndReceive()
     print("Received: \(responseMessage.text)")
   }
 
@@ -164,7 +164,7 @@ if client != "" {
       var running = true
       while running {
         do {
-          let responseMessage = try updateCall.Receive()
+          let responseMessage = try updateCall.receive()
           print("Received: \(responseMessage.text)")
         } catch Echo_EchoClientError.endOfStream {
           print("update closed")
@@ -180,10 +180,10 @@ if client != "" {
     for part in parts {
       let requestMessage = Echo_EchoRequest(text:part)
       print("Sending: " + requestMessage.text)
-      try updateCall.Send(requestMessage)
+      try updateCall.send(requestMessage)
       sleep(1)
     }
-    try updateCall.CloseSend()
+    try updateCall.closeSend()
 
     // Wait for the call to complete.
     latch.wait()

+ 6 - 6
Examples/Echo/Xcode/Echo/EchoViewController.swift

@@ -217,7 +217,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
       var running = true
       while running {
         do {
-          let responseMessage = try expandCall.Receive()
+          let responseMessage = try expandCall.receive()
           self.displayMessageReceived(responseMessage.text)
         } catch Echo_EchoClientError.endOfStream {
           self.displayMessageReceived("Done.")
@@ -233,7 +233,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
     if let collectCall = collectCall {
       let requestMessage = Echo_EchoRequest(text:self.messageField.stringValue)
       self.displayMessageSent(requestMessage.text)
-      try collectCall.Send(requestMessage)
+      try collectCall.send(requestMessage)
     }
   }
 
@@ -241,7 +241,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
     if let updateCall = updateCall {
       let requestMessage = Echo_EchoRequest(text:self.messageField.stringValue)
       self.displayMessageSent(requestMessage.text)
-      try updateCall.Send(requestMessage)
+      try updateCall.send(requestMessage)
     }
   }
 
@@ -253,7 +253,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
       var running = true
       while running {
         do {
-          let responseMessage = try updateCall.Receive()
+          let responseMessage = try updateCall.receive()
           self.displayMessageReceived(responseMessage.text)
         } catch Echo_EchoClientError.endOfStream {
           self.displayMessageReceived("Done.")
@@ -267,14 +267,14 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
 
   func sendClose() throws {
     if let updateCall = updateCall {
-      try updateCall.CloseSend()
+      try updateCall.closeSend()
       self.updateCall = nil
       self.nowStreaming = false
       self.closeButton.isEnabled = false
     }
     if let collectCall = collectCall {
       do {
-        let responseMessage = try collectCall.CloseAndReceive()
+        let responseMessage = try collectCall.closeAndReceive()
         self.displayMessageReceived(responseMessage.text)
       } catch (let error) {
         self.displayMessageReceived("No message received. \(error)")

+ 3 - 3
Examples/Simple/PackageManager/Makefile

@@ -1,9 +1,9 @@
 
 CFLAGS = \
 -Xcc -DOPENSSL_NO_ASM \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/BoringSSL/include \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC/include
+-Xcc -IPackages/SwiftGRPC-0.1.7/Sources/BoringSSL/include \
+-Xcc -IPackages/SwiftGRPC-0.1.7/Sources/CgRPC \
+-Xcc -IPackages/SwiftGRPC-0.1.7/Sources/CgRPC/include
 
 LDFLAGS = -Xlinker -lz 
 

+ 1 - 1
Examples/Simple/PackageManager/Package.swift

@@ -34,6 +34,6 @@ import PackageDescription
 let package = Package (
     name: "Simple",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,6)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,7)),
     ]
 )