Skip to content

Commit 319cdde

Browse files
authored
Rename server (#1724)
1 parent f88a9c0 commit 319cdde

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Sources/GRPCCore/Server.swift renamed to Sources/GRPCCore/GRPCServer.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import Atomics
3434
/// The following example demonstrates how to create and configure a server.
3535
///
3636
/// ```swift
37-
/// let server = Server()
37+
/// let server = GRPCServer()
3838
///
3939
/// // Create and add an in-process transport.
4040
/// let inProcessTransport = InProcessServerTransport()
@@ -66,7 +66,7 @@ import Atomics
6666
/// that need their lifecycles managed you should consider using [Swift Service
6767
/// Lifecycle](https://github.com/swift-server/swift-service-lifecycle).
6868
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
69-
public final class Server: Sendable {
69+
public final class GRPCServer: Sendable {
7070
typealias Stream = RPCStream<ServerTransport.Inbound, ServerTransport.Outbound>
7171

7272
/// A collection of ``ServerTransport`` implementations that the server uses to listen
@@ -406,7 +406,7 @@ public final class Server: Sendable {
406406
}
407407

408408
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
409-
extension Server {
409+
extension GRPCServer {
410410
/// The transports which provide a bidirectional communication channel with clients.
411411
///
412412
/// You can add a new transport by calling ``add(_:)``.
@@ -456,14 +456,14 @@ extension Server {
456456
}
457457

458458
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
459-
extension Server.Transports: CustomStringConvertible {
459+
extension GRPCServer.Transports: CustomStringConvertible {
460460
public var description: String {
461461
return String(describing: self.values)
462462
}
463463
}
464464

465465
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
466-
extension Server.Services: CustomStringConvertible {
466+
extension GRPCServer.Services: CustomStringConvertible {
467467
public var description: String {
468468
// List the fully qualified all methods ordered by service and then method
469469
let rpcs = self.router.methods.map { $0.fullyQualifiedMethod }.sorted()
@@ -472,7 +472,7 @@ extension Server.Services: CustomStringConvertible {
472472
}
473473

474474
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
475-
extension Server.Interceptors: CustomStringConvertible {
475+
extension GRPCServer.Interceptors: CustomStringConvertible {
476476
public var description: String {
477477
return String(describing: self.values.map { String(describing: type(of: $0)) })
478478
}

Tests/GRPCCoreTests/ServerTests.swift renamed to Tests/GRPCCoreTests/GRPCServerTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import GRPCCore
1818
import XCTest
1919

2020
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
21-
final class ServerTests: XCTestCase {
21+
final class GRPCServerTests: XCTestCase {
2222
func makeInProcessPair() -> (client: InProcessClientTransport, server: InProcessServerTransport) {
2323
let server = InProcessServerTransport()
2424
let client = InProcessClientTransport(
@@ -32,10 +32,10 @@ final class ServerTests: XCTestCase {
3232
func withInProcessClientConnectedToServer(
3333
services: [any RegistrableRPCService],
3434
interceptors: [any ServerInterceptor] = [],
35-
_ body: (InProcessClientTransport, Server) async throws -> Void
35+
_ body: (InProcessClientTransport, GRPCServer) async throws -> Void
3636
) async throws {
3737
let inProcess = self.makeInProcessPair()
38-
let server = Server()
38+
let server = GRPCServer()
3939
server.transports.add(inProcess.server)
4040

4141
for service in services {
@@ -308,7 +308,7 @@ final class ServerTests: XCTestCase {
308308
func testCancelRunningServer() async throws {
309309
let inProcess = self.makeInProcessPair()
310310
let task = Task {
311-
let server = Server()
311+
let server = GRPCServer()
312312
server.services.register(BinaryEcho())
313313
server.transports.add(inProcess.server)
314314
try await server.run()
@@ -329,7 +329,7 @@ final class ServerTests: XCTestCase {
329329
}
330330

331331
func testTestRunServerWithNoTransport() async throws {
332-
let server = Server()
332+
let server = GRPCServer()
333333
await XCTAssertThrowsErrorAsync(ofType: ServerError.self) {
334334
try await server.run()
335335
} errorHandler: { error in
@@ -338,7 +338,7 @@ final class ServerTests: XCTestCase {
338338
}
339339

340340
func testTestRunStoppedServer() async throws {
341-
let server = Server()
341+
let server = GRPCServer()
342342
server.transports.add(InProcessServerTransport())
343343
// Run the server.
344344
let task = Task { try await server.run() }
@@ -354,7 +354,7 @@ final class ServerTests: XCTestCase {
354354
}
355355

356356
func testRunServerWhenTransportThrows() async throws {
357-
let server = Server()
357+
let server = GRPCServer()
358358
server.transports.add(ThrowOnRunServerTransport())
359359
await XCTAssertThrowsErrorAsync(ofType: ServerError.self) {
360360
try await server.run()
@@ -364,7 +364,7 @@ final class ServerTests: XCTestCase {
364364
}
365365

366366
func testRunServerDrainsRunningTransportsWhenOneFailsToStart() async throws {
367-
let server = Server()
367+
let server = GRPCServer()
368368

369369
// Register the in process transport first and allow it to come up.
370370
let inProcess = self.makeInProcessPair()
@@ -406,7 +406,7 @@ final class ServerTests: XCTestCase {
406406
}
407407

408408
func testInterceptorsDescription() async throws {
409-
let server = Server()
409+
let server = GRPCServer()
410410
server.interceptors.add(.rejectAll(with: .init(code: .aborted, message: "")))
411411
server.interceptors.add(.requestCounter(.init(0)))
412412
let description = String(describing: server.interceptors)
@@ -415,7 +415,7 @@ final class ServerTests: XCTestCase {
415415
}
416416

417417
func testServicesDescription() async throws {
418-
let server = Server()
418+
let server = GRPCServer()
419419
let methods: [(String, String)] = [
420420
("helloworld.Greeter", "SayHello"),
421421
("echo.Echo", "Foo"),

0 commit comments

Comments
 (0)