diff options
author | Muxi Yan <mxyan@google.com> | 2016-10-20 15:26:01 -0700 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2016-10-20 15:30:08 -0700 |
commit | 4a08e7146468e4195912476e71fdb8427292def5 (patch) | |
tree | 733c84d56c9bbb9cab8016c726fa582a879d4887 /src/objective-c/examples/SwiftSample/ViewController.swift | |
parent | 9243c74868dbf581a98f7799e71f29cd1d55d79f (diff) |
Revert PR #8425
Diffstat (limited to 'src/objective-c/examples/SwiftSample/ViewController.swift')
-rw-r--r-- | src/objective-c/examples/SwiftSample/ViewController.swift | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/objective-c/examples/SwiftSample/ViewController.swift b/src/objective-c/examples/SwiftSample/ViewController.swift index 6b25e71f2d..66d4fa9412 100644 --- a/src/objective-c/examples/SwiftSample/ViewController.swift +++ b/src/objective-c/examples/SwiftSample/ViewController.swift @@ -51,7 +51,7 @@ class ViewController: UIViewController { // Example gRPC call using a generated proto client library: let service = RMTTestService(host: RemoteHost) - service.unaryCall(with: request) { response, error in + service.unaryCallWithRequest(request) { response, error in if let response = response { NSLog("1. Finished successfully with response:\n\(response)") } else { @@ -63,39 +63,40 @@ class ViewController: UIViewController { // Same but manipulating headers: var RPC : GRPCProtoCall! // Needed to convince Swift to capture by reference (__block) - RPC = service.rpcToUnaryCall(with: request) { response, error in + RPC = service.RPCToUnaryCallWithRequest(request) { response, error in if let response = response { NSLog("2. Finished successfully with response:\n\(response)") } else { NSLog("2. Finished with error: \(error!)") } - NSLog("2. Response headers: \(RPC.responseHeaders!)") - NSLog("2. Response trailers: \(RPC.responseTrailers!)") + NSLog("2. Response headers: \(RPC.responseHeaders)") + NSLog("2. Response trailers: \(RPC.responseTrailers)") } - RPC.requestHeaders["My-Header"] = "My value"; + // TODO(jcanizales): Revert to using subscript syntax once XCode 8 is released. + RPC.requestHeaders.setObject("My value", forKey: "My-Header") RPC.start() // Same example call using the generic gRPC client library: - let method = GRPCProtoMethod(package: "grpc.testing", service: "TestService", method: "UnaryCall")! + let method = GRPCProtoMethod(package: "grpc.testing", service: "TestService", method: "UnaryCall") let requestsWriter = GRXWriter(value: request.data()) - let call = GRPCCall(host: RemoteHost, path: method.httpPath, requestsWriter: requestsWriter)! + let call = GRPCCall(host: RemoteHost, path: method.HTTPPath, requestsWriter: requestsWriter) - call.requestHeaders["My-Header"] = "My value"; + call.requestHeaders.setObject("My value", forKey: "My-Header") - call.start(with: GRXWriteable { response, error in - if let response = response as? Data { + call.startWithWriteable(GRXWriteable { response, error in + if let response = response as? NSData { NSLog("3. Received response:\n\(try! RMTSimpleResponse(data: response))") } else { NSLog("3. Finished with error: \(error!)") } - NSLog("3. Response headers: \(call.responseHeaders!)") - NSLog("3. Response trailers: \(call.responseTrailers!)") + NSLog("3. Response headers: \(call.responseHeaders)") + NSLog("3. Response trailers: \(call.responseTrailers)") }) } } |