Skip to content

Commit 10f3576

Browse files
Changed the name of the package of the reflection.proto (grpc#1695)
Motivation: The name was not complete and GRPCurl's requests for the Reflection Service resulted in error. Modifications: Changed the name of the package, regenerated the Service code and changed the type of the variables accordingly, in the Service implementation and in the tests. Result: GRPCurl will be able to make requests to Servers implementing the Reflection Service.
1 parent 959cbd3 commit 10f3576

File tree

7 files changed

+239
-237
lines changed

7 files changed

+239
-237
lines changed

Sources/GRPCReflectionService/Model/reflection.grpc.swift

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import SwiftProtobuf
1212

1313

1414
/// To build a server, implement a class that conforms to this protocol.
15-
internal protocol Reflection_ServerReflectionProvider: CallHandlerProvider {
16-
var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? { get }
15+
internal protocol Grpc_Reflection_V1_ServerReflectionProvider: CallHandlerProvider {
16+
var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? { get }
1717

1818
/// The reflection service is structured as a bidirectional stream, ensuring
1919
/// all related requests go to a single server.
20-
func serverReflectionInfo(context: StreamingResponseCallContext<Reflection_ServerReflectionResponse>) -> EventLoopFuture<(StreamEvent<Reflection_ServerReflectionRequest>) -> Void>
20+
func serverReflectionInfo(context: StreamingResponseCallContext<Grpc_Reflection_V1_ServerReflectionResponse>) -> EventLoopFuture<(StreamEvent<Grpc_Reflection_V1_ServerReflectionRequest>) -> Void>
2121
}
2222

23-
extension Reflection_ServerReflectionProvider {
23+
extension Grpc_Reflection_V1_ServerReflectionProvider {
2424
internal var serviceName: Substring {
25-
return Reflection_ServerReflectionServerMetadata.serviceDescriptor.fullName[...]
25+
return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor.fullName[...]
2626
}
2727

2828
/// Determines, calls and returns the appropriate request handler, depending on the request's method.
@@ -35,8 +35,8 @@ extension Reflection_ServerReflectionProvider {
3535
case "ServerReflectionInfo":
3636
return BidirectionalStreamingServerHandler(
3737
context: context,
38-
requestDeserializer: ProtobufDeserializer<Reflection_ServerReflectionRequest>(),
39-
responseSerializer: ProtobufSerializer<Reflection_ServerReflectionResponse>(),
38+
requestDeserializer: ProtobufDeserializer<Grpc_Reflection_V1_ServerReflectionRequest>(),
39+
responseSerializer: ProtobufSerializer<Grpc_Reflection_V1_ServerReflectionResponse>(),
4040
interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [],
4141
observerFactory: self.serverReflectionInfo(context:)
4242
)
@@ -49,30 +49,30 @@ extension Reflection_ServerReflectionProvider {
4949

5050
/// To implement a server, implement an object which conforms to this protocol.
5151
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
52-
internal protocol Reflection_ServerReflectionAsyncProvider: CallHandlerProvider, Sendable {
52+
internal protocol Grpc_Reflection_V1_ServerReflectionAsyncProvider: CallHandlerProvider, Sendable {
5353
static var serviceDescriptor: GRPCServiceDescriptor { get }
54-
var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? { get }
54+
var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? { get }
5555

5656
/// The reflection service is structured as a bidirectional stream, ensuring
5757
/// all related requests go to a single server.
5858
func serverReflectionInfo(
59-
requestStream: GRPCAsyncRequestStream<Reflection_ServerReflectionRequest>,
60-
responseStream: GRPCAsyncResponseStreamWriter<Reflection_ServerReflectionResponse>,
59+
requestStream: GRPCAsyncRequestStream<Grpc_Reflection_V1_ServerReflectionRequest>,
60+
responseStream: GRPCAsyncResponseStreamWriter<Grpc_Reflection_V1_ServerReflectionResponse>,
6161
context: GRPCAsyncServerCallContext
6262
) async throws
6363
}
6464

6565
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
66-
extension Reflection_ServerReflectionAsyncProvider {
66+
extension Grpc_Reflection_V1_ServerReflectionAsyncProvider {
6767
internal static var serviceDescriptor: GRPCServiceDescriptor {
68-
return Reflection_ServerReflectionServerMetadata.serviceDescriptor
68+
return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor
6969
}
7070

7171
internal var serviceName: Substring {
72-
return Reflection_ServerReflectionServerMetadata.serviceDescriptor.fullName[...]
72+
return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor.fullName[...]
7373
}
7474

75-
internal var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? {
75+
internal var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? {
7676
return nil
7777
}
7878

@@ -84,8 +84,8 @@ extension Reflection_ServerReflectionAsyncProvider {
8484
case "ServerReflectionInfo":
8585
return GRPCAsyncServerHandler(
8686
context: context,
87-
requestDeserializer: ProtobufDeserializer<Reflection_ServerReflectionRequest>(),
88-
responseSerializer: ProtobufSerializer<Reflection_ServerReflectionResponse>(),
87+
requestDeserializer: ProtobufDeserializer<Grpc_Reflection_V1_ServerReflectionRequest>(),
88+
responseSerializer: ProtobufSerializer<Grpc_Reflection_V1_ServerReflectionResponse>(),
8989
interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [],
9090
wrapping: { try await self.serverReflectionInfo(requestStream: $0, responseStream: $1, context: $2) }
9191
)
@@ -96,26 +96,26 @@ extension Reflection_ServerReflectionAsyncProvider {
9696
}
9797
}
9898

99-
internal protocol Reflection_ServerReflectionServerInterceptorFactoryProtocol: Sendable {
99+
internal protocol Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol: Sendable {
100100

101101
/// - Returns: Interceptors to use when handling 'serverReflectionInfo'.
102102
/// Defaults to calling `self.makeInterceptors()`.
103-
func makeServerReflectionInfoInterceptors() -> [ServerInterceptor<Reflection_ServerReflectionRequest, Reflection_ServerReflectionResponse>]
103+
func makeServerReflectionInfoInterceptors() -> [ServerInterceptor<Grpc_Reflection_V1_ServerReflectionRequest, Grpc_Reflection_V1_ServerReflectionResponse>]
104104
}
105105

106-
internal enum Reflection_ServerReflectionServerMetadata {
106+
internal enum Grpc_Reflection_V1_ServerReflectionServerMetadata {
107107
internal static let serviceDescriptor = GRPCServiceDescriptor(
108108
name: "ServerReflection",
109-
fullName: "reflection.ServerReflection",
109+
fullName: "grpc.reflection.v1.ServerReflection",
110110
methods: [
111-
Reflection_ServerReflectionServerMetadata.Methods.serverReflectionInfo,
111+
Grpc_Reflection_V1_ServerReflectionServerMetadata.Methods.serverReflectionInfo,
112112
]
113113
)
114114

115115
internal enum Methods {
116116
internal static let serverReflectionInfo = GRPCMethodDescriptor(
117117
name: "ServerReflectionInfo",
118-
path: "/reflection.ServerReflection/ServerReflectionInfo",
118+
path: "/grpc.reflection.v1.ServerReflection/ServerReflectionInfo",
119119
type: GRPCCallType.bidirectionalStreaming
120120
)
121121
}

0 commit comments

Comments
 (0)