Skip to content

Commit 752ca35

Browse files
glbrnttglbrntt
committed
Update route-guide tutorial
1 parent bd779a3 commit 752ca35

25 files changed

+174
-324
lines changed

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec01-step07-description.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ let package = Package(
55
name: "RouteGuide",
66
platforms: [.macOS(.v15)],
77
dependencies: [
8-
.package(url: "https://github.com/grpc/grpc-swift.git", from: "2.0.0-alpha.1"),
9-
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "1.0.0-alpha.1"),
8+
.package(url: "https://github.com/grpc/grpc-swift.git", from: "2.0.0-beta.1"),
9+
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "1.0.0-beta.1"),
10+
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", from: "1.0.0-beta.1"),
1011
],
1112
targets: []
1213
)

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec01-step08-description.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ let package = Package(
55
name: "RouteGuide",
66
platforms: [.macOS(.v15)],
77
dependencies: [
8-
.package(url: "https://github.com/grpc/grpc-swift.git", from: "2.0.0-alpha.1"),
9-
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "1.0.0-alpha.1"),
8+
.package(url: "https://github.com/grpc/grpc-swift.git", from: "2.0.0-beta.1"),
9+
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "1.0.0-beta.1"),
10+
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", from: "1.0.0-beta.1"),
1011
],
1112
targets: [
1213
.executableTarget(

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step01-struct.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
}

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step02-unimplemented.swift‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
func getFeature(
5-
request: ServerRequest<Routeguide_Point>,
5+
request: Routeguide_Point,
66
context: ServerContext
7-
) async throws -> ServerResponse<Routeguide_Feature> {
7+
) async throws -> Routeguide_Feature {
88
}
99

1010
func listFeatures(
11-
request: ServerRequest<Routeguide_Rectangle>,
11+
request: Routeguide_Rectangle,
12+
response: RPCWriter<Routeguide_Feature>,
1213
context: ServerContext
13-
) async throws -> StreamingServerResponse<Routeguide_Feature> {
14+
) async throws {
1415
}
1516

1617
func recordRoute(
17-
request: StreamingServerRequest<Routeguide_Point>,
18+
request: RPCAsyncSequence<Routeguide_Point, any Error>,
1819
context: ServerContext
19-
) async throws -> ServerResponse<Routeguide_RouteSummary> {
20+
) async throws -> Routeguide_RouteSummary {
2021
}
2122

2223
func routeChat(
23-
request: StreamingServerRequest<Routeguide_RouteNote>,
24+
request: RPCAsyncSequence<Routeguide_RouteNote, any Error>,
25+
response: RPCWriter<Routeguide_RouteNote>,
2426
context: ServerContext
25-
) async throws -> StreamingServerResponse<Routeguide_RouteNote> {
27+
) async throws {
2628
}
2729
}

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step03-features.swift‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
/// Known features.
55
private let features: [Routeguide_Feature]
66

@@ -11,26 +11,28 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
1111
}
1212

1313
func getFeature(
14-
request: ServerRequest<Routeguide_Point>,
14+
request: Routeguide_Point,
1515
context: ServerContext
16-
) async throws -> ServerResponse<Routeguide_Feature> {
16+
) async throws -> Routeguide_Feature {
1717
}
1818

1919
func listFeatures(
20-
request: ServerRequest<Routeguide_Rectangle>,
20+
request: Routeguide_Rectangle,
21+
response: RPCWriter<Routeguide_Feature>,
2122
context: ServerContext
22-
) async throws -> StreamingServerResponse<Routeguide_Feature> {
23+
) async throws {
2324
}
2425

2526
func recordRoute(
26-
request: StreamingServerRequest<Routeguide_Point>,
27+
request: RPCAsyncSequence<Routeguide_Point, any Error>,
2728
context: ServerContext
28-
) async throws -> ServerResponse<Routeguide_RouteSummary> {
29+
) async throws -> Routeguide_RouteSummary {
2930
}
3031

3132
func routeChat(
32-
request: StreamingServerRequest<Routeguide_RouteNote>,
33+
request: RPCAsyncSequence<Routeguide_RouteNote, any Error>,
34+
response: RPCWriter<Routeguide_RouteNote>,
3335
context: ServerContext
34-
) async throws -> StreamingServerResponse<Routeguide_RouteNote> {
36+
) async throws {
3537
}
3638
}

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step04-unary.swift‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
/// Known features.
55
private let features: [Routeguide_Feature]
66

@@ -18,30 +18,32 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
1818
}
1919

2020
func getFeature(
21-
request: ServerRequest<Routeguide_Point>,
21+
request: Routeguide_Point,
2222
context: ServerContext
23-
) async throws -> ServerResponse<Routeguide_Feature> {
23+
) async throws -> Routeguide_Feature {
2424
let feature = self.findFeature(
2525
latitude: request.message.latitude,
2626
longitude: request.message.longitude
2727
)
2828
}
2929

3030
func listFeatures(
31-
request: ServerRequest<Routeguide_Rectangle>,
31+
request: Routeguide_Rectangle,
32+
response: RPCWriter<Routeguide_Feature>,
3233
context: ServerContext
33-
) async throws -> StreamingServerResponse<Routeguide_Feature> {
34+
) async throws {
3435
}
3536

3637
func recordRoute(
37-
request: StreamingServerRequest<Routeguide_Point>,
38+
request: RPCAsyncSequence<Routeguide_Point, any Error>,
3839
context: ServerContext
39-
) async throws -> ServerResponse<Routeguide_RouteSummary> {
40+
) async throws -> Routeguide_RouteSummary {
4041
}
4142

4243
func routeChat(
43-
request: StreamingServerRequest<Routeguide_RouteNote>,
44+
request: RPCAsyncSequence<Routeguide_RouteNote, any Error>,
45+
response: RPCWriter<Routeguide_RouteNote>,
4446
context: ServerContext
45-
) async throws -> StreamingServerResponse<Routeguide_RouteNote> {
47+
) async throws {
4648
}
4749
}

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step05-unary.swift‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
/// Known features.
55
private let features: [Routeguide_Feature]
66

@@ -18,16 +18,16 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
1818
}
1919

2020
func getFeature(
21-
request: ServerRequest<Routeguide_Point>,
21+
request: Routeguide_Point,
2222
context: ServerContext
23-
) async throws -> ServerResponse<Routeguide_Feature> {
23+
) async throws -> Routeguide_Feature {
2424
let feature = self.findFeature(
2525
latitude: request.message.latitude,
2626
longitude: request.message.longitude
2727
)
2828

2929
if let feature {
30-
return ServerResponse(message: feature)
30+
return feature
3131
} else {
3232
// No feature: return a feature with an empty name.
3333
let unknownFeature = Routeguide_Feature.with {
@@ -37,25 +37,27 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3737
$0.longitude = request.message.longitude
3838
}
3939
}
40-
return ServerResponse(message: unknownFeature)
40+
return unknownFeature
4141
}
4242
}
4343

4444
func listFeatures(
45-
request: ServerRequest<Routeguide_Rectangle>,
45+
request: Routeguide_Rectangle,
46+
response: RPCWriter<Routeguide_Feature>,
4647
context: ServerContext
47-
) async throws -> StreamingServerResponse<Routeguide_Feature> {
48+
) async throws {
4849
}
4950

5051
func recordRoute(
51-
request: StreamingServerRequest<Routeguide_Point>,
52+
request: RPCAsyncSequence<Routeguide_Point, any Error>,
5253
context: ServerContext
53-
) async throws -> ServerResponse<Routeguide_RouteSummary> {
54+
) async throws -> Routeguide_RouteSummary {
5455
}
5556

5657
func routeChat(
57-
request: StreamingServerRequest<Routeguide_RouteNote>,
58+
request: RPCAsyncSequence<Routeguide_RouteNote, any Error>,
59+
response: RPCWriter<Routeguide_RouteNote>,
5860
context: ServerContext
59-
) async throws -> StreamingServerResponse<Routeguide_RouteNote> {
61+
) async throws {
6062
}
6163
}

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step06-server-streaming.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import GRPCCore
22

3-
struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3+
struct RouteGuideService: Routeguide_RouteGuide.SimpleServiceProtocol {
44
/// Known features.
55
private let features: [Routeguide_Feature]
66

@@ -18,16 +18,16 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
1818
}
1919

2020
func getFeature(
21-
request: ServerRequest<Routeguide_Point>,
21+
request: Routeguide_Point,
2222
context: ServerContext
23-
) async throws -> ServerResponse<Routeguide_Feature> {
23+
) async throws -> Routeguide_Feature {
2424
let feature = self.findFeature(
2525
latitude: request.message.latitude,
2626
longitude: request.message.longitude
2727
)
2828

2929
if let feature {
30-
return ServerResponse(message: feature)
30+
return feature
3131
} else {
3232
// No feature: return a feature with an empty name.
3333
let unknownFeature = Routeguide_Feature.with {
@@ -37,33 +37,33 @@ struct RouteGuideService: Routeguide_RouteGuide.ServiceProtocol {
3737
$0.longitude = request.message.longitude
3838
}
3939
}
40-
return ServerResponse(message: unknownFeature)
40+
return unknownFeature
4141
}
4242
}
4343

4444
func listFeatures(
45-
request: ServerRequest<Routeguide_Rectangle>,
45+
request: Routeguide_Rectangle,
46+
response: RPCWriter<Routeguide_Feature>,
4647
context: ServerContext
47-
) async throws -> StreamingServerResponse<Routeguide_Feature> {
48-
return StreamingServerResponse { writer in
49-
for feature in self.features {
50-
if !feature.name.isEmpty, feature.isContained(by: request.message) {
51-
try await writer.write(feature)
52-
}
48+
) async throws {
49+
for feature in self.features {
50+
if !feature.name.isEmpty, feature.isContained(by: request) {
51+
try await response.write(feature)
5352
}
5453
}
5554
}
5655

5756
func recordRoute(
58-
request: StreamingServerRequest<Routeguide_Point>,
57+
request: RPCAsyncSequence<Routeguide_Point, any Error>,
5958
context: ServerContext
60-
) async throws -> ServerResponse<Routeguide_RouteSummary> {
59+
) async throws -> Routeguide_RouteSummary {
6160
}
6261

6362
func routeChat(
64-
request: StreamingServerRequest<Routeguide_RouteNote>,
63+
request: RPCAsyncSequence<Routeguide_RouteNote, any Error>,
64+
response: RPCWriter<Routeguide_RouteNote>,
6565
context: ServerContext
66-
) async throws -> StreamingServerResponse<Routeguide_RouteNote> {
66+
) async throws {
6767
}
6868
}
6969

‎Sources/GRPCCore/Documentation.docc/Tutorials/Route-Guide/Resources/route-guide-sec04-step07-server-streaming.swift‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)