Browse Source

Remove try! from generated client code.

Tim Burks 9 years ago
parent
commit
013db6aaa1

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

@@ -167,7 +167,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
         nowStreaming = true
         closeButton.isEnabled = true
       }
-      self.sendCollectMessage()
+      try self.sendCollectMessage()
     }
     else if (self.callSelectButton.selectedSegment == 3) {
       // STREAMING UPDATE
@@ -177,7 +177,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
         nowStreaming = true
         closeButton.isEnabled = true
       }
-      self.sendUpdateMessage()
+      try self.sendUpdateMessage()
     }
   }
 
@@ -201,19 +201,19 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
     }
   }
 
-  func sendCollectMessage() {
+  func sendCollectMessage() throws {
     if let collectCall = collectCall {
       let requestMessage = Echo_EchoRequest(text:self.messageField.stringValue)
       self.displayMessageSent(requestMessage.text)
-      collectCall.Send(requestMessage)
+      try collectCall.Send(requestMessage)
     }
   }
 
-  func sendUpdateMessage() {
+  func sendUpdateMessage() throws {
     if let updateCall = updateCall {
       let requestMessage = Echo_EchoRequest(text:self.messageField.stringValue)
       self.displayMessageSent(requestMessage.text)
-      updateCall.Send(requestMessage)
+      try updateCall.Send(requestMessage)
     }
   }
 
@@ -239,7 +239,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
 
   func sendClose() throws {
     if let updateCall = updateCall {
-      updateCall.CloseSend()
+      try updateCall.CloseSend()
       self.updateCall = nil
       self.nowStreaming = false
       self.closeButton.isEnabled = false

+ 13 - 13
Examples/Echo/Swift/Generated/echo.client.pb.swift

@@ -62,9 +62,9 @@ public class Echo_EchoGetCall {
     let done = NSCondition()
     var callResult : CallResult!
     var responseMessage : Echo_EchoResponse?
-    let requestMessageData = try! request.serializeProtobuf()
-    try! call.perform(message: requestMessageData,
-                      metadata: metadata)
+    let requestMessageData = try request.serializeProtobuf()
+    try call.perform(message: requestMessageData,
+                     metadata: metadata)
     {(_callResult) in
       callResult = _callResult
       if let messageData = callResult.resultData {
@@ -96,10 +96,10 @@ public class Echo_EchoExpandCall {
 
   // Call this once with the message to send.
   fileprivate func run(request: Echo_EchoRequest, metadata: Metadata) throws -> Echo_EchoExpandCall {
-    let requestMessageData = try! request.serializeProtobuf()
-    try! call.startServerStreaming(message: requestMessageData,
-                                   metadata: metadata,
-                                   completion:{(CallResult) in })
+    let requestMessageData = try request.serializeProtobuf()
+    try call.startServerStreaming(message: requestMessageData,
+                                  metadata: metadata,
+                                  completion:{(CallResult) in })
     return self
   }
 
@@ -149,8 +149,8 @@ public class Echo_EchoCollectCall {
   }
 
   // Call this to send each message in the request stream.
-  public func Send(_ message: Echo_EchoRequest) {
-    let messageData = try! message.serializeProtobuf()
+  public func Send(_ message: Echo_EchoRequest) throws {
+    let messageData = try message.serializeProtobuf()
     _ = call.sendMessage(data:messageData)
   }
 
@@ -264,14 +264,14 @@ public class Echo_EchoUpdateCall {
     return returnMessage
   }
 
-  public func Send(_ message:Echo_EchoRequest) {
-    let messageData = try! message.serializeProtobuf()
+  public func Send(_ message:Echo_EchoRequest) throws {
+    let messageData = try message.serializeProtobuf()
     _ = call.sendMessage(data:messageData)
   }
 
-  public func CloseSend() {
+  public func CloseSend() throws {
     let done = NSCondition()
-    try! call.close() {
+    try call.close() {
       done.lock()
       done.signal()
       done.unlock()

+ 4 - 4
Plugin/templates/client-call-bidistreaming.swift

@@ -54,14 +54,14 @@ public class {{ .|call:protoFile,service,method }} {
     return returnMessage
   }
 
-  public func Send(_ message:{{ method|input }}) {
-    let messageData = try! message.serializeProtobuf()
+  public func Send(_ message:{{ method|input }}) throws {
+    let messageData = try message.serializeProtobuf()
     _ = call.sendMessage(data:messageData)
   }
 
-  public func CloseSend() {
+  public func CloseSend() throws {
     let done = NSCondition()
-    try! call.close() {
+    try call.close() {
       done.lock()
       done.signal()
       done.unlock()

+ 2 - 2
Plugin/templates/client-call-clientstreaming.swift

@@ -14,8 +14,8 @@ public class {{ .|call:protoFile,service,method }} {
   }
 
   // Call this to send each message in the request stream.
-  public func Send(_ message: {{ method|input }}) {
-    let messageData = try! message.serializeProtobuf()
+  public func Send(_ message: {{ method|input }}) throws {
+    let messageData = try message.serializeProtobuf()
     _ = call.sendMessage(data:messageData)
   }
 

+ 4 - 4
Plugin/templates/client-call-serverstreaming.swift

@@ -9,10 +9,10 @@ public class {{ .|call:protoFile,service,method }} {
 
   // Call this once with the message to send.
   fileprivate func run(request: {{ method|input }}, metadata: Metadata) throws -> {{ .|call:protoFile,service,method }} {
-    let requestMessageData = try! request.serializeProtobuf()
-    try! call.startServerStreaming(message: requestMessageData,
-                                   metadata: metadata,
-                                   completion:{(CallResult) in })
+    let requestMessageData = try request.serializeProtobuf()
+    try call.startServerStreaming(message: requestMessageData,
+                                  metadata: metadata,
+                                  completion:{(CallResult) in })
     return self
   }
 

+ 3 - 3
Plugin/templates/client-call-unary.swift

@@ -13,9 +13,9 @@ public class {{ .|call:protoFile,service,method }} {
     let done = NSCondition()
     var callResult : CallResult!
     var responseMessage : {{ method|output }}?
-    let requestMessageData = try! request.serializeProtobuf()
-    try! call.perform(message: requestMessageData,
-                      metadata: metadata)
+    let requestMessageData = try request.serializeProtobuf()
+    try call.perform(message: requestMessageData,
+                     metadata: metadata)
     {(_callResult) in
       callResult = _callResult
       if let messageData = callResult.resultData {