Rename "services" to "serviceProviders".

grpc · Jun 13, 2018 · a6e8cbb · a6e8cbb
1 parent 98f7fa6
commit a6e8cbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Examples/EchoXcode/Echo/AppDelegate.swift b/Examples/EchoXcode/Echo/AppDelegate.swift
@@ -29,7 +29,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 	// create and start a server for handling insecure requests
 	insecureServer = ServiceServer(address: "localhost:8081",
-								   services: [echoProvider])
+								   serviceProviders: [echoProvider])
 	insecureServer.start()
 
 	// create and start a server for handling secure requests
@@ -38,7 +38,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	secureServer = ServiceServer(address: "localhost:8443",
 								 certificateURL: certificateURL,
 								 keyURL: keyURL,
-								 services: [echoProvider])
+								 serviceProviders: [echoProvider])
 	secureServer.start()
   }
 }
diff --git a/Sources/Examples/Echo/main.swift b/Sources/Examples/Echo/main.swift
@@ -69,11 +69,11 @@ Group {
       echoServer = ServiceServer(address: address + ":" + port,
                                  certificateURL: certificateURL,
                                  keyURL: keyURL,
-                                 services: [EchoProvider()])
+                                 serviceProviders: [EchoProvider()])
       echoServer?.start()
     } else {
       print("starting insecure server")
-      echoServer = ServiceServer(address: address + ":" + port, services: [EchoProvider()])
+      echoServer = ServiceServer(address: address + ":" + port, serviceProviders: [EchoProvider()])
       echoServer?.start()
     }
     // This blocks to keep the main thread from finishing while the server runs,

diff --git a/Sources/SwiftGRPC/Runtime/ServiceServer.swift b/Sources/SwiftGRPC/Runtime/ServiceServer.swift
@@ -27,30 +27,30 @@ open class ServiceServer {
   fileprivate let servicesByName: [String: ServiceProvider]
 
   /// Create a server that accepts insecure connections.
-  public init(address: String, services: [ServiceProvider]) {
+  public init(address: String, serviceProviders: [ServiceProvider]) {
     gRPC.initialize()
     self.address = address
     server = Server(address: address)
-    servicesByName = Dictionary(uniqueKeysWithValues: services.map { ($0.serviceName, $0) })
+    servicesByName = Dictionary(uniqueKeysWithValues: serviceProviders.map { ($0.serviceName, $0) })
   }
 
   /// Create a server that accepts secure connections.
-  public init(address: String, certificateString: String, keyString: String, services: [ServiceProvider]) {
+  public init(address: String, certificateString: String, keyString: String, serviceProviders: [ServiceProvider]) {
     gRPC.initialize()
     self.address = address
     server = Server(address: address, key: keyString, certs: certificateString)
-    servicesByName = Dictionary(uniqueKeysWithValues: services.map { ($0.serviceName, $0) })
+    servicesByName = Dictionary(uniqueKeysWithValues: serviceProviders.map { ($0.serviceName, $0) })
   }
 
   /// Create a server that accepts secure connections.
-  public init?(address: String, certificateURL: URL, keyURL: URL, services: [ServiceProvider]) {
+  public init?(address: String, certificateURL: URL, keyURL: URL, serviceProviders: [ServiceProvider]) {
     guard let certificate = try? String(contentsOf: certificateURL, encoding: .utf8),
       let key = try? String(contentsOf: keyURL, encoding: .utf8)
       else { return nil }
     gRPC.initialize()
     self.address = address
     server = Server(address: address, key: key, certs: certificate)
-    servicesByName = Dictionary(uniqueKeysWithValues: services.map { ($0.serviceName, $0) })
+    servicesByName = Dictionary(uniqueKeysWithValues: serviceProviders.map { ($0.serviceName, $0) })
   }
 
   /// Start the server.

diff --git a/Tests/SwiftGRPCTests/BasicEchoTestCase.swift b/Tests/SwiftGRPCTests/BasicEchoTestCase.swift
@@ -51,12 +51,12 @@ class BasicEchoTestCase: XCTestCase {
       server = ServiceServer(address: address,
                              certificateString: certificateString,
                              keyString: String(data: keyForTests, encoding: .utf8)!,
-                             services: [provider])
+                             serviceProviders: [provider])
       server.start()
       client = Echo_EchoServiceClient(address: address, certificates: certificateString, arguments: [.sslTargetNameOverride("example.com")])
       client.host = "example.com"
     } else {
-      server = ServiceServer(address: address, services: [provider])
+      server = ServiceServer(address: address, serviceProviders: [provider])
       server.start()
       client = Echo_EchoServiceClient(address: address, secure: false)
     }