Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Examples/echo/Sources/Generated/echo.grpc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ internal enum Echo_Echo {
]
}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias StreamingServiceProtocol = Echo_EchoStreamingServiceProtocol
internal typealias StreamingServiceProtocol = Echo_Echo_StreamingServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ServiceProtocol = Echo_EchoServiceProtocol
internal typealias ServiceProtocol = Echo_Echo_ServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ClientProtocol = Echo_EchoClientProtocol
internal typealias ClientProtocol = Echo_Echo_ClientProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias Client = Echo_EchoClient
internal typealias Client = Echo_Echo_Client
}

extension GRPCCore.ServiceDescriptor {
Expand All @@ -84,7 +84,7 @@ extension GRPCCore.ServiceDescriptor {
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Echo_EchoStreamingServiceProtocol: GRPCCore.RegistrableRPCService {
internal protocol Echo_Echo_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
/// Immediately returns an echo of a request.
func get(
request: GRPCCore.ServerRequest.Stream<Echo_EchoRequest>,
Expand Down Expand Up @@ -163,7 +163,7 @@ extension Echo_Echo.StreamingServiceProtocol {
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Echo_EchoServiceProtocol: Echo_Echo.StreamingServiceProtocol {
internal protocol Echo_Echo_ServiceProtocol: Echo_Echo.StreamingServiceProtocol {
/// Immediately returns an echo of a request.
func get(
request: GRPCCore.ServerRequest.Single<Echo_EchoRequest>,
Expand All @@ -189,7 +189,7 @@ internal protocol Echo_EchoServiceProtocol: Echo_Echo.StreamingServiceProtocol {
) async throws -> GRPCCore.ServerResponse.Stream<Echo_EchoResponse>
}

/// Partial conformance to `Echo_EchoStreamingServiceProtocol`.
/// Partial conformance to `Echo_Echo_StreamingServiceProtocol`.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension Echo_Echo.ServiceProtocol {
internal func get(
Expand Down Expand Up @@ -227,7 +227,7 @@ extension Echo_Echo.ServiceProtocol {
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Echo_EchoClientProtocol: Sendable {
internal protocol Echo_Echo_ClientProtocol: Sendable {
/// Immediately returns an echo of a request.
func get<R>(
request: GRPCCore.ClientRequest.Single<Echo_EchoRequest>,
Expand Down Expand Up @@ -408,7 +408,7 @@ extension Echo_Echo.ClientProtocol {
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal struct Echo_EchoClient: Echo_Echo.ClientProtocol {
internal struct Echo_Echo_Client: Echo_Echo.ClientProtocol {
private let client: GRPCCore.GRPCClient

internal init(wrapping client: GRPCCore.GRPCClient) {
Expand Down
2 changes: 1 addition & 1 deletion Examples/echo/Sources/Subcommands/Collect.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct Collect: AsyncParsableCommand {
try await client.run()
}

let echo = Echo_EchoClient(wrapping: client)
let echo = Echo_Echo_Client(wrapping: client)

for _ in 0 ..< self.arguments.repetitions {
let message = try await echo.collect { writer in
Expand Down
2 changes: 1 addition & 1 deletion Examples/echo/Sources/Subcommands/Expand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct Expand: AsyncParsableCommand {
try await client.run()
}

let echo = Echo_EchoClient(wrapping: client)
let echo = Echo_Echo_Client(wrapping: client)

for _ in 0 ..< self.arguments.repetitions {
let message = Echo_EchoRequest.with { $0.text = self.arguments.message }
Expand Down
2 changes: 1 addition & 1 deletion Examples/echo/Sources/Subcommands/Get.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct Get: AsyncParsableCommand {
try await client.run()
}

let echo = Echo_EchoClient(wrapping: client)
let echo = Echo_Echo_Client(wrapping: client)

for _ in 0 ..< self.arguments.repetitions {
let message = Echo_EchoRequest.with { $0.text = self.arguments.message }
Expand Down
2 changes: 1 addition & 1 deletion Examples/echo/Sources/Subcommands/Serve.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct Serve: AsyncParsableCommand {
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
struct EchoService: Echo_EchoServiceProtocol {
struct EchoService: Echo_Echo_ServiceProtocol {
func get(
request: ServerRequest.Single<Echo_EchoRequest>,
context: ServerContext
Expand Down
2 changes: 1 addition & 1 deletion Examples/echo/Sources/Subcommands/Update.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct Update: AsyncParsableCommand {
try await client.run()
}

let echo = Echo_EchoClient(wrapping: client)
let echo = Echo_Echo_Client(wrapping: client)

for _ in 0 ..< self.arguments.repetitions {
try await echo.update { writer in
Expand Down
18 changes: 9 additions & 9 deletions Examples/hello-world/Sources/Generated/helloworld.grpc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ internal enum Helloworld_Greeter {
]
}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias StreamingServiceProtocol = Helloworld_GreeterStreamingServiceProtocol
internal typealias StreamingServiceProtocol = Helloworld_Greeter_StreamingServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ServiceProtocol = Helloworld_GreeterServiceProtocol
internal typealias ServiceProtocol = Helloworld_Greeter_ServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ClientProtocol = Helloworld_GreeterClientProtocol
internal typealias ClientProtocol = Helloworld_Greeter_ClientProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias Client = Helloworld_GreeterClient
internal typealias Client = Helloworld_Greeter_Client
}

extension GRPCCore.ServiceDescriptor {
Expand All @@ -58,7 +58,7 @@ extension GRPCCore.ServiceDescriptor {

/// The greeting service definition.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Helloworld_GreeterStreamingServiceProtocol: GRPCCore.RegistrableRPCService {
internal protocol Helloworld_Greeter_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
/// Sends a greeting
func sayHello(
request: GRPCCore.ServerRequest.Stream<Helloworld_HelloRequest>,
Expand Down Expand Up @@ -87,15 +87,15 @@ extension Helloworld_Greeter.StreamingServiceProtocol {

/// The greeting service definition.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Helloworld_GreeterServiceProtocol: Helloworld_Greeter.StreamingServiceProtocol {
internal protocol Helloworld_Greeter_ServiceProtocol: Helloworld_Greeter.StreamingServiceProtocol {
/// Sends a greeting
func sayHello(
request: GRPCCore.ServerRequest.Single<Helloworld_HelloRequest>,
context: GRPCCore.ServerContext
) async throws -> GRPCCore.ServerResponse.Single<Helloworld_HelloReply>
}

/// Partial conformance to `Helloworld_GreeterStreamingServiceProtocol`.
/// Partial conformance to `Helloworld_Greeter_StreamingServiceProtocol`.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension Helloworld_Greeter.ServiceProtocol {
internal func sayHello(
Expand All @@ -112,7 +112,7 @@ extension Helloworld_Greeter.ServiceProtocol {

/// The greeting service definition.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Helloworld_GreeterClientProtocol: Sendable {
internal protocol Helloworld_Greeter_ClientProtocol: Sendable {
/// Sends a greeting
func sayHello<R>(
request: GRPCCore.ClientRequest.Single<Helloworld_HelloRequest>,
Expand Down Expand Up @@ -167,7 +167,7 @@ extension Helloworld_Greeter.ClientProtocol {

/// The greeting service definition.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal struct Helloworld_GreeterClient: Helloworld_Greeter.ClientProtocol {
internal struct Helloworld_Greeter_Client: Helloworld_Greeter.ClientProtocol {
private let client: GRPCCore.GRPCClient

internal init(wrapping client: GRPCCore.GRPCClient) {
Expand Down
2 changes: 1 addition & 1 deletion Examples/hello-world/Sources/Subcommands/Greet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct Greet: AsyncParsableCommand {
client.beginGracefulShutdown()
}

let greeter = Helloworld_GreeterClient(wrapping: client)
let greeter = Helloworld_Greeter_Client(wrapping: client)
let reply = try await greeter.sayHello(.with { $0.name = self.name })
print(reply.message)
}
Expand Down
2 changes: 1 addition & 1 deletion Examples/hello-world/Sources/Subcommands/Serve.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct Serve: AsyncParsableCommand {
}
}

struct Greeter: Helloworld_GreeterServiceProtocol {
struct Greeter: Helloworld_Greeter_ServiceProtocol {
func sayHello(
request: ServerRequest.Single<Helloworld_HelloRequest>,
context: ServerContext
Expand Down
18 changes: 9 additions & 9 deletions Examples/route-guide/Sources/Generated/route_guide.grpc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ internal enum Routeguide_RouteGuide {
]
}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias StreamingServiceProtocol = Routeguide_RouteGuideStreamingServiceProtocol
internal typealias StreamingServiceProtocol = Routeguide_RouteGuide_StreamingServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ServiceProtocol = Routeguide_RouteGuideServiceProtocol
internal typealias ServiceProtocol = Routeguide_RouteGuide_ServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias ClientProtocol = Routeguide_RouteGuideClientProtocol
internal typealias ClientProtocol = Routeguide_RouteGuide_ClientProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal typealias Client = Routeguide_RouteGuideClient
internal typealias Client = Routeguide_RouteGuide_Client
}

extension GRPCCore.ServiceDescriptor {
Expand All @@ -85,7 +85,7 @@ extension GRPCCore.ServiceDescriptor {

/// Interface exported by the server.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Routeguide_RouteGuideStreamingServiceProtocol: GRPCCore.RegistrableRPCService {
internal protocol Routeguide_RouteGuide_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
/// A simple RPC.
///
/// Obtains the feature at a given position.
Expand Down Expand Up @@ -181,7 +181,7 @@ extension Routeguide_RouteGuide.StreamingServiceProtocol {

/// Interface exported by the server.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Routeguide_RouteGuideServiceProtocol: Routeguide_RouteGuide.StreamingServiceProtocol {
internal protocol Routeguide_RouteGuide_ServiceProtocol: Routeguide_RouteGuide.StreamingServiceProtocol {
/// A simple RPC.
///
/// Obtains the feature at a given position.
Expand Down Expand Up @@ -223,7 +223,7 @@ internal protocol Routeguide_RouteGuideServiceProtocol: Routeguide_RouteGuide.St
) async throws -> GRPCCore.ServerResponse.Stream<Routeguide_RouteNote>
}

/// Partial conformance to `Routeguide_RouteGuideStreamingServiceProtocol`.
/// Partial conformance to `Routeguide_RouteGuide_StreamingServiceProtocol`.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension Routeguide_RouteGuide.ServiceProtocol {
internal func getFeature(
Expand Down Expand Up @@ -262,7 +262,7 @@ extension Routeguide_RouteGuide.ServiceProtocol {

/// Interface exported by the server.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol Routeguide_RouteGuideClientProtocol: Sendable {
internal protocol Routeguide_RouteGuide_ClientProtocol: Sendable {
/// A simple RPC.
///
/// Obtains the feature at a given position.
Expand Down Expand Up @@ -476,7 +476,7 @@ extension Routeguide_RouteGuide.ClientProtocol {

/// Interface exported by the server.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal struct Routeguide_RouteGuideClient: Routeguide_RouteGuide.ClientProtocol {
internal struct Routeguide_RouteGuide_Client: Routeguide_RouteGuide.ClientProtocol {
private let client: GRPCCore.GRPCClient

internal init(wrapping client: GRPCCore.GRPCClient) {
Expand Down
2 changes: 1 addition & 1 deletion Examples/route-guide/Sources/Subcommands/GetFeature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct GetFeature: AsyncParsableCommand {
try await client.run()
}

let routeGuide = Routeguide_RouteGuideClient(wrapping: client)
let routeGuide = Routeguide_RouteGuide_Client(wrapping: client)

let point = Routeguide_Point.with {
$0.latitude = self.latitude
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct ListFeatures: AsyncParsableCommand {
try await client.run()
}

let routeGuide = Routeguide_RouteGuideClient(wrapping: client)
let routeGuide = Routeguide_RouteGuide_Client(wrapping: client)
let boundingRectangle = Routeguide_Rectangle.with {
$0.lo.latitude = self.minLatitude
$0.hi.latitude = self.maxLatitude
Expand Down
2 changes: 1 addition & 1 deletion Examples/route-guide/Sources/Subcommands/RecordRoute.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct RecordRoute: AsyncParsableCommand {
try await client.run()
}

let routeGuide = Routeguide_RouteGuideClient(wrapping: client)
let routeGuide = Routeguide_RouteGuide_Client(wrapping: client)

// Get all features.
let rectangle = Routeguide_Rectangle.with {
Expand Down
2 changes: 1 addition & 1 deletion Examples/route-guide/Sources/Subcommands/RouteChat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct RouteChat: AsyncParsableCommand {
try await client.run()
}

let routeGuide = Routeguide_RouteGuideClient(wrapping: client)
let routeGuide = Routeguide_RouteGuide_Client(wrapping: client)

try await routeGuide.routeChat { writer in
let notes: [(String, (Int32, Int32))] = [
Expand Down
Loading