Echo internal cleanup

Examples/Echo/Swift/Echo/Base.lproj/MainMenu.xib

@@ -134,7 +134,7 @@
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jnU-RF-9F0">
                         <rect key="frame" x="20" y="61" width="360" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="localhost:8080" placeholderString="Server Address" drawsBackground="YES" id="mDa-qc-62R">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="localhost:8081" placeholderString="Server Address" drawsBackground="YES" id="mDa-qc-62R">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

Examples/Echo/Swift/Echo/EchoViewController.swift

@@ -60,18 +60,14 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
 
   @IBAction func addressReturnPressed(sender: NSTextField) {
     if (streaming) {
-      print ("stop streaming")
       self.sendClose()
     }
   }
 
   @IBAction func buttonValueChanged(sender: NSButton) {
-    print("button value changed \(sender)")
     if (streaming && (sender.intValue == 0)) {
-      print ("stop streaming")
       self.sendClose()
     }
-
   }
 
   override func viewDidLoad() {
@@ -84,29 +80,26 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
     }
   }
 
-  func log(_ message: String) {
-    print(message)
-  }
-
   func callServer(address:String) {
-    gRPC.initialize()
+    let requestHost = "foo.test.google.fr"
+    let requestMetadata = Metadata(["x-goog-api-key":"YOUR_API_KEY",
+                                    "x-ios-bundle-identifier":Bundle.main.bundleIdentifier!])
 
     if (self.streamingButton.intValue == 0) {
       // NONSTREAMING
-
-      // build the message
       if let requestMessage = self.fileDescriptorSet.createMessage("EchoRequest") {
         requestMessage.addField("text", value:self.messageField.stringValue)
-        let requestHost = "foo.test.google.fr"
-        let requestMethod = "/echo.Echo/Get"
-        let requestMetadata = Metadata()
+        let requestMessageData = requestMessage.serialize()
 
         client = Client(address:address)
-        call = client.createCall(host: requestHost, method: requestMethod, timeout: 30.0)
-        call.performNonStreamingCall(messageData: requestMessage.serialize(),
+        call = client.createCall(host: requestHost,
+                                 method: "/echo.Echo/Get",
+                                 timeout: 30.0)
+
+        call.performNonStreamingCall(messageData: requestMessageData,
                                      metadata: requestMetadata)
         { (response) in
-          self.log("Received status: \(response.status) " + response.statusDetails)
+          print("Received status: \(response.status) " + response.statusDetails)
           if let messageData = response.messageData,
             let responseMessage = self.fileDescriptorSet.readMessage("EchoResponse",
                                                                      data:messageData) {
@@ -117,7 +110,8 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
             }
           } else {
             DispatchQueue.main.async {
-              self.outputField.stringValue = "No message received. gRPC Status \(response.status) " + response.statusDetails
+              self.outputField.stringValue = "No message received. gRPC Status \(response.status) "
+                + response.statusDetails
             }
           }
         }
@@ -127,13 +121,12 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
       // STREAMING
       if (!streaming) {
         client = Client(address:address)
-        call = client.createCall(host: "foo.test.google.fr",
+        call = client.createCall(host: requestHost,
                                  method: "/echo.Echo/Update",
-                                 timeout: 600.0)
-        let metadata = Metadata(["x-goog-api-key":"YOUR_API_KEY",
-                                 "x-ios-bundle-identifier":Bundle.main.bundleIdentifier!])
-        call.start(metadata:metadata)
-        self.receiveMessage() // this should take a block in which we specify what to do
+                                 timeout: 30.0)
+
+        call.start(metadata:requestMetadata)
+        self.receiveMessage()
         streaming = true
       }
       self.sendMessage()
@@ -149,7 +142,7 @@ class EchoViewController : NSViewController, NSTextFieldDelegate {
 
   func receiveMessage() {
     call.receiveMessage() {(data) in
-      let responseMessage = self.fileDescriptorSet.readMessage( "EchoResponse", data:data)!
+      let responseMessage = self.fileDescriptorSet.readMessage("EchoResponse", data:data)!
       responseMessage.forOneField("text") {(field) in
         DispatchQueue.main.async {
           self.outputField.stringValue = field.string()

Packages/gRPC/Sources/Call.swift

@@ -114,7 +114,6 @@ public class Call {
                                            operation_receiveStatusOnClient,
                                            operation_receiveMessage])
     { (event) in
-      print("client nonstreaming call complete")
       if (event.type == GRPC_OP_COMPLETE) {
         let response = CallResponse(status:operation_receiveStatusOnClient.status(),
                                     statusDetails:operation_receiveStatusOnClient.statusDetails(),
@@ -127,7 +126,9 @@ public class Call {
       }
     }
     let call_error = self.perform(call: self, operations: group)
-    print ("call error = \(call_error)")
+    if call_error != GRPC_CALL_OK {
+      print ("call error = \(call_error)")
+    }
   }
 
   // perform a group of operations (used internally)

Packages/gRPC/Sources/CompletionQueue.swift

@@ -84,7 +84,6 @@ class CompletionQueue {
         }
       }
       DispatchQueue.main.async {
-        print("exiting completion queue loop " + self.name)
         completion()
       }
     }

Packages/gRPC/Sources/Handler.swift

@@ -143,8 +143,6 @@ public class Handler {
         operation_sendStatusFromServer,
         operation_sendMessage])
     {(call_error) in
-      print("server response complete")
-      print("finished with handler \(self)")
       self.shutdown()
     }
     self.completionQueue.operationGroups[operations.tag] = operations
@@ -164,7 +162,6 @@ public class Handler {
     let operations = OperationGroup(call:call, operations:[operation_sendInitialMetadata])
     {(event) in
       if (event.type == GRPC_OP_COMPLETE) {
-        print("server sendMetadata complete")
         completion()
       } else {
         completion()