From 902374bcc263a0c9de323dc26310d74b7847da78 Mon Sep 17 00:00:00 2001 From: Stefana Dranca Date: Mon, 30 Oct 2023 19:19:30 +0000 Subject: [PATCH] Changed the name of the package of the reflection.proto 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. --- .../Model/reflection.grpc.swift | 46 +++---- .../Model/reflection.pb.swift | 126 +++++++++--------- .../Model/reflection.proto | 2 +- .../Server/ReflectionService.swift | 72 +++++----- .../Generated/reflection.grpc.swift | 86 ++++++------ .../Generated/reflection.pb.swift | 126 +++++++++--------- .../ReflectionServiceIntegrationTests.swift | 18 +-- 7 files changed, 239 insertions(+), 237 deletions(-) diff --git a/Sources/GRPCReflectionService/Model/reflection.grpc.swift b/Sources/GRPCReflectionService/Model/reflection.grpc.swift index 2239744da..0cd46f660 100644 --- a/Sources/GRPCReflectionService/Model/reflection.grpc.swift +++ b/Sources/GRPCReflectionService/Model/reflection.grpc.swift @@ -12,17 +12,17 @@ import SwiftProtobuf /// To build a server, implement a class that conforms to this protocol. -internal protocol Reflection_ServerReflectionProvider: CallHandlerProvider { - var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? { get } +internal protocol Grpc_Reflection_V1_ServerReflectionProvider: CallHandlerProvider { + var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? { get } /// The reflection service is structured as a bidirectional stream, ensuring /// all related requests go to a single server. - func serverReflectionInfo(context: StreamingResponseCallContext) -> EventLoopFuture<(StreamEvent) -> Void> + func serverReflectionInfo(context: StreamingResponseCallContext) -> EventLoopFuture<(StreamEvent) -> Void> } -extension Reflection_ServerReflectionProvider { +extension Grpc_Reflection_V1_ServerReflectionProvider { internal var serviceName: Substring { - return Reflection_ServerReflectionServerMetadata.serviceDescriptor.fullName[...] + return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor.fullName[...] } /// Determines, calls and returns the appropriate request handler, depending on the request's method. @@ -35,8 +35,8 @@ extension Reflection_ServerReflectionProvider { case "ServerReflectionInfo": return BidirectionalStreamingServerHandler( context: context, - requestDeserializer: ProtobufDeserializer(), - responseSerializer: ProtobufSerializer(), + requestDeserializer: ProtobufDeserializer(), + responseSerializer: ProtobufSerializer(), interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [], observerFactory: self.serverReflectionInfo(context:) ) @@ -49,30 +49,30 @@ extension Reflection_ServerReflectionProvider { /// To implement a server, implement an object which conforms to this protocol. @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -internal protocol Reflection_ServerReflectionAsyncProvider: CallHandlerProvider, Sendable { +internal protocol Grpc_Reflection_V1_ServerReflectionAsyncProvider: CallHandlerProvider, Sendable { static var serviceDescriptor: GRPCServiceDescriptor { get } - var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? { get } + var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? { get } /// The reflection service is structured as a bidirectional stream, ensuring /// all related requests go to a single server. func serverReflectionInfo( - requestStream: GRPCAsyncRequestStream, - responseStream: GRPCAsyncResponseStreamWriter, + requestStream: GRPCAsyncRequestStream, + responseStream: GRPCAsyncResponseStreamWriter, context: GRPCAsyncServerCallContext ) async throws } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -extension Reflection_ServerReflectionAsyncProvider { +extension Grpc_Reflection_V1_ServerReflectionAsyncProvider { internal static var serviceDescriptor: GRPCServiceDescriptor { - return Reflection_ServerReflectionServerMetadata.serviceDescriptor + return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor } internal var serviceName: Substring { - return Reflection_ServerReflectionServerMetadata.serviceDescriptor.fullName[...] + return Grpc_Reflection_V1_ServerReflectionServerMetadata.serviceDescriptor.fullName[...] } - internal var interceptors: Reflection_ServerReflectionServerInterceptorFactoryProtocol? { + internal var interceptors: Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol? { return nil } @@ -84,8 +84,8 @@ extension Reflection_ServerReflectionAsyncProvider { case "ServerReflectionInfo": return GRPCAsyncServerHandler( context: context, - requestDeserializer: ProtobufDeserializer(), - responseSerializer: ProtobufSerializer(), + requestDeserializer: ProtobufDeserializer(), + responseSerializer: ProtobufSerializer(), interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [], wrapping: { try await self.serverReflectionInfo(requestStream: $0, responseStream: $1, context: $2) } ) @@ -96,26 +96,26 @@ extension Reflection_ServerReflectionAsyncProvider { } } -internal protocol Reflection_ServerReflectionServerInterceptorFactoryProtocol: Sendable { +internal protocol Grpc_Reflection_V1_ServerReflectionServerInterceptorFactoryProtocol: Sendable { /// - Returns: Interceptors to use when handling 'serverReflectionInfo'. /// Defaults to calling `self.makeInterceptors()`. - func makeServerReflectionInfoInterceptors() -> [ServerInterceptor] + func makeServerReflectionInfoInterceptors() -> [ServerInterceptor] } -internal enum Reflection_ServerReflectionServerMetadata { +internal enum Grpc_Reflection_V1_ServerReflectionServerMetadata { internal static let serviceDescriptor = GRPCServiceDescriptor( name: "ServerReflection", - fullName: "reflection.ServerReflection", + fullName: "grpc.reflection.v1.ServerReflection", methods: [ - Reflection_ServerReflectionServerMetadata.Methods.serverReflectionInfo, + Grpc_Reflection_V1_ServerReflectionServerMetadata.Methods.serverReflectionInfo, ] ) internal enum Methods { internal static let serverReflectionInfo = GRPCMethodDescriptor( name: "ServerReflectionInfo", - path: "/reflection.ServerReflection/ServerReflectionInfo", + path: "/grpc.reflection.v1.ServerReflection/ServerReflectionInfo", type: GRPCCallType.bidirectionalStreaming ) } diff --git a/Sources/GRPCReflectionService/Model/reflection.pb.swift b/Sources/GRPCReflectionService/Model/reflection.pb.swift index f86e9577c..8e0d557c4 100644 --- a/Sources/GRPCReflectionService/Model/reflection.pb.swift +++ b/Sources/GRPCReflectionService/Model/reflection.pb.swift @@ -42,7 +42,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP } /// The message sent by the client when calling ServerReflectionInfo method. -public struct Reflection_ServerReflectionRequest { +public struct Grpc_Reflection_V1_ServerReflectionRequest { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -52,7 +52,7 @@ public struct Reflection_ServerReflectionRequest { /// To use reflection service, the client should set one of the following /// fields in message_request. The server distinguishes requests by their /// defined field and then handles them using corresponding methods. - public var messageRequest: Reflection_ServerReflectionRequest.OneOf_MessageRequest? = nil + public var messageRequest: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest? = nil /// Find a proto file by the file name. public var fileByFilename: String { @@ -76,10 +76,10 @@ public struct Reflection_ServerReflectionRequest { /// Find the proto file which defines an extension extending the given /// message type with the given field number. - public var fileContainingExtension: Reflection_ExtensionRequest { + public var fileContainingExtension: Grpc_Reflection_V1_ExtensionRequest { get { if case .fileContainingExtension(let v)? = messageRequest {return v} - return Reflection_ExtensionRequest() + return Grpc_Reflection_V1_ExtensionRequest() } set {messageRequest = .fileContainingExtension(newValue)} } @@ -124,7 +124,7 @@ public struct Reflection_ServerReflectionRequest { case fileContainingSymbol(String) /// Find the proto file which defines an extension extending the given /// message type with the given field number. - case fileContainingExtension(Reflection_ExtensionRequest) + case fileContainingExtension(Grpc_Reflection_V1_ExtensionRequest) /// Finds the tag numbers used by all known extensions of the given message /// type, and appends them to ExtensionNumberResponse in an undefined order. /// Its corresponding method is best-effort: it's not guaranteed that the @@ -139,7 +139,7 @@ public struct Reflection_ServerReflectionRequest { case listServices(String) #if !swift(>=4.1) - public static func ==(lhs: Reflection_ServerReflectionRequest.OneOf_MessageRequest, rhs: Reflection_ServerReflectionRequest.OneOf_MessageRequest) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest, rhs: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest) -> Bool { // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every case branch when no optimizations are // enabled. https://github.com/apple/swift-protobuf/issues/1034 @@ -175,7 +175,7 @@ public struct Reflection_ServerReflectionRequest { /// The type name and extension number sent by the client when requesting /// file_containing_extension. -public struct Reflection_ExtensionRequest { +public struct Grpc_Reflection_V1_ExtensionRequest { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -191,15 +191,15 @@ public struct Reflection_ExtensionRequest { } /// The message sent by the server to answer ServerReflectionInfo method. -public struct Reflection_ServerReflectionResponse { +public struct Grpc_Reflection_V1_ServerReflectionResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. public var validHost: String = String() - public var originalRequest: Reflection_ServerReflectionRequest { - get {return _originalRequest ?? Reflection_ServerReflectionRequest()} + public var originalRequest: Grpc_Reflection_V1_ServerReflectionRequest { + get {return _originalRequest ?? Grpc_Reflection_V1_ServerReflectionRequest()} set {_originalRequest = newValue} } /// Returns true if `originalRequest` has been explicitly set. @@ -209,7 +209,7 @@ public struct Reflection_ServerReflectionResponse { /// The server sets one of the following fields according to the message_request /// in the request. - public var messageResponse: Reflection_ServerReflectionResponse.OneOf_MessageResponse? = nil + public var messageResponse: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse? = nil /// This message is used to answer file_by_filename, file_containing_symbol, /// file_containing_extension requests with transitive dependencies. @@ -217,37 +217,37 @@ public struct Reflection_ServerReflectionResponse { /// FileDescriptorResponse message to encapsulate the repeated fields. /// The reflection service is allowed to avoid sending FileDescriptorProtos /// that were previously sent in response to earlier requests in the stream. - public var fileDescriptorResponse: Reflection_FileDescriptorResponse { + public var fileDescriptorResponse: Grpc_Reflection_V1_FileDescriptorResponse { get { if case .fileDescriptorResponse(let v)? = messageResponse {return v} - return Reflection_FileDescriptorResponse() + return Grpc_Reflection_V1_FileDescriptorResponse() } set {messageResponse = .fileDescriptorResponse(newValue)} } /// This message is used to answer all_extension_numbers_of_type requests. - public var allExtensionNumbersResponse: Reflection_ExtensionNumberResponse { + public var allExtensionNumbersResponse: Grpc_Reflection_V1_ExtensionNumberResponse { get { if case .allExtensionNumbersResponse(let v)? = messageResponse {return v} - return Reflection_ExtensionNumberResponse() + return Grpc_Reflection_V1_ExtensionNumberResponse() } set {messageResponse = .allExtensionNumbersResponse(newValue)} } /// This message is used to answer list_services requests. - public var listServicesResponse: Reflection_ListServiceResponse { + public var listServicesResponse: Grpc_Reflection_V1_ListServiceResponse { get { if case .listServicesResponse(let v)? = messageResponse {return v} - return Reflection_ListServiceResponse() + return Grpc_Reflection_V1_ListServiceResponse() } set {messageResponse = .listServicesResponse(newValue)} } /// This message is used when an error occurs. - public var errorResponse: Reflection_ErrorResponse { + public var errorResponse: Grpc_Reflection_V1_ErrorResponse { get { if case .errorResponse(let v)? = messageResponse {return v} - return Reflection_ErrorResponse() + return Grpc_Reflection_V1_ErrorResponse() } set {messageResponse = .errorResponse(newValue)} } @@ -263,16 +263,16 @@ public struct Reflection_ServerReflectionResponse { /// FileDescriptorResponse message to encapsulate the repeated fields. /// The reflection service is allowed to avoid sending FileDescriptorProtos /// that were previously sent in response to earlier requests in the stream. - case fileDescriptorResponse(Reflection_FileDescriptorResponse) + case fileDescriptorResponse(Grpc_Reflection_V1_FileDescriptorResponse) /// This message is used to answer all_extension_numbers_of_type requests. - case allExtensionNumbersResponse(Reflection_ExtensionNumberResponse) + case allExtensionNumbersResponse(Grpc_Reflection_V1_ExtensionNumberResponse) /// This message is used to answer list_services requests. - case listServicesResponse(Reflection_ListServiceResponse) + case listServicesResponse(Grpc_Reflection_V1_ListServiceResponse) /// This message is used when an error occurs. - case errorResponse(Reflection_ErrorResponse) + case errorResponse(Grpc_Reflection_V1_ErrorResponse) #if !swift(>=4.1) - public static func ==(lhs: Reflection_ServerReflectionResponse.OneOf_MessageResponse, rhs: Reflection_ServerReflectionResponse.OneOf_MessageResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse, rhs: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse) -> Bool { // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every case branch when no optimizations are // enabled. https://github.com/apple/swift-protobuf/issues/1034 @@ -301,13 +301,13 @@ public struct Reflection_ServerReflectionResponse { public init() {} - fileprivate var _originalRequest: Reflection_ServerReflectionRequest? = nil + fileprivate var _originalRequest: Grpc_Reflection_V1_ServerReflectionRequest? = nil } /// Serialized FileDescriptorProto messages sent by the server answering /// a file_by_filename, file_containing_symbol, or file_containing_extension /// request. -public struct Reflection_FileDescriptorResponse { +public struct Grpc_Reflection_V1_FileDescriptorResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -324,7 +324,7 @@ public struct Reflection_FileDescriptorResponse { /// A list of extension numbers sent by the server answering /// all_extension_numbers_of_type request. -public struct Reflection_ExtensionNumberResponse { +public struct Grpc_Reflection_V1_ExtensionNumberResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -341,14 +341,14 @@ public struct Reflection_ExtensionNumberResponse { } /// A list of ServiceResponse sent by the server answering list_services request. -public struct Reflection_ListServiceResponse { +public struct Grpc_Reflection_V1_ListServiceResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. /// The information of each service may be expanded in the future, so we use /// ServiceResponse message to encapsulate it. - public var service: [Reflection_ServiceResponse] = [] + public var service: [Grpc_Reflection_V1_ServiceResponse] = [] public var unknownFields = SwiftProtobuf.UnknownStorage() @@ -357,7 +357,7 @@ public struct Reflection_ListServiceResponse { /// The information of a single service used by ListServiceResponse to answer /// list_services request. -public struct Reflection_ServiceResponse { +public struct Grpc_Reflection_V1_ServiceResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -372,7 +372,7 @@ public struct Reflection_ServiceResponse { } /// The error code and error message sent by the server when an error occurs. -public struct Reflection_ErrorResponse { +public struct Grpc_Reflection_V1_ErrorResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -388,23 +388,23 @@ public struct Reflection_ErrorResponse { } #if swift(>=5.5) && canImport(_Concurrency) -extension Reflection_ServerReflectionRequest: @unchecked Sendable {} -extension Reflection_ServerReflectionRequest.OneOf_MessageRequest: @unchecked Sendable {} -extension Reflection_ExtensionRequest: @unchecked Sendable {} -extension Reflection_ServerReflectionResponse: @unchecked Sendable {} -extension Reflection_ServerReflectionResponse.OneOf_MessageResponse: @unchecked Sendable {} -extension Reflection_FileDescriptorResponse: @unchecked Sendable {} -extension Reflection_ExtensionNumberResponse: @unchecked Sendable {} -extension Reflection_ListServiceResponse: @unchecked Sendable {} -extension Reflection_ServiceResponse: @unchecked Sendable {} -extension Reflection_ErrorResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ExtensionRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_FileDescriptorResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ExtensionNumberResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ListServiceResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServiceResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ErrorResponse: @unchecked Sendable {} #endif // swift(>=5.5) && canImport(_Concurrency) // MARK: - Code below here is support for the SwiftProtobuf runtime. -fileprivate let _protobuf_package = "reflection" +fileprivate let _protobuf_package = "grpc.reflection.v1" -extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ServerReflectionRequest" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "host"), @@ -439,7 +439,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob } }() case 5: try { - var v: Reflection_ExtensionRequest? + var v: Grpc_Reflection_V1_ExtensionRequest? var hadOneofValue = false if let current = self.messageRequest { hadOneofValue = true @@ -506,7 +506,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ServerReflectionRequest, rhs: Reflection_ServerReflectionRequest) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ServerReflectionRequest, rhs: Grpc_Reflection_V1_ServerReflectionRequest) -> Bool { if lhs.host != rhs.host {return false} if lhs.messageRequest != rhs.messageRequest {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -514,7 +514,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob } } -extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ExtensionRequest" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "containing_type"), @@ -544,7 +544,7 @@ extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ExtensionRequest, rhs: Reflection_ExtensionRequest) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ExtensionRequest, rhs: Grpc_Reflection_V1_ExtensionRequest) -> Bool { if lhs.containingType != rhs.containingType {return false} if lhs.extensionNumber != rhs.extensionNumber {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -552,7 +552,7 @@ extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes } } -extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ServerReflectionResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "valid_host"), @@ -572,7 +572,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto case 1: try { try decoder.decodeSingularStringField(value: &self.validHost) }() case 2: try { try decoder.decodeSingularMessageField(value: &self._originalRequest) }() case 4: try { - var v: Reflection_FileDescriptorResponse? + var v: Grpc_Reflection_V1_FileDescriptorResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -585,7 +585,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 5: try { - var v: Reflection_ExtensionNumberResponse? + var v: Grpc_Reflection_V1_ExtensionNumberResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -598,7 +598,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 6: try { - var v: Reflection_ListServiceResponse? + var v: Grpc_Reflection_V1_ListServiceResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -611,7 +611,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 7: try { - var v: Reflection_ErrorResponse? + var v: Grpc_Reflection_V1_ErrorResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -661,7 +661,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ServerReflectionResponse, rhs: Reflection_ServerReflectionResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ServerReflectionResponse, rhs: Grpc_Reflection_V1_ServerReflectionResponse) -> Bool { if lhs.validHost != rhs.validHost {return false} if lhs._originalRequest != rhs._originalRequest {return false} if lhs.messageResponse != rhs.messageResponse {return false} @@ -670,7 +670,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } } -extension Reflection_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".FileDescriptorResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "file_descriptor_proto"), @@ -695,14 +695,14 @@ extension Reflection_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobu try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_FileDescriptorResponse, rhs: Reflection_FileDescriptorResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_FileDescriptorResponse, rhs: Grpc_Reflection_V1_FileDescriptorResponse) -> Bool { if lhs.fileDescriptorProto != rhs.fileDescriptorProto {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ExtensionNumberResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "base_type_name"), @@ -732,7 +732,7 @@ extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtob try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ExtensionNumberResponse, rhs: Reflection_ExtensionNumberResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ExtensionNumberResponse, rhs: Grpc_Reflection_V1_ExtensionNumberResponse) -> Bool { if lhs.baseTypeName != rhs.baseTypeName {return false} if lhs.extensionNumber != rhs.extensionNumber {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -740,7 +740,7 @@ extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtob } } -extension Reflection_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ListServiceResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "service"), @@ -765,14 +765,14 @@ extension Reflection_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._ try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ListServiceResponse, rhs: Reflection_ListServiceResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ListServiceResponse, rhs: Grpc_Reflection_V1_ListServiceResponse) -> Bool { if lhs.service != rhs.service {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ServiceResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "name"), @@ -797,14 +797,14 @@ extension Reflection_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._Mess try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ServiceResponse, rhs: Reflection_ServiceResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ServiceResponse, rhs: Grpc_Reflection_V1_ServiceResponse) -> Bool { if lhs.name != rhs.name {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { public static let protoMessageName: String = _protobuf_package + ".ErrorResponse" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "error_code"), @@ -834,7 +834,7 @@ extension Reflection_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._Messag try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: Reflection_ErrorResponse, rhs: Reflection_ErrorResponse) -> Bool { + public static func ==(lhs: Grpc_Reflection_V1_ErrorResponse, rhs: Grpc_Reflection_V1_ErrorResponse) -> Bool { if lhs.errorCode != rhs.errorCode {return false} if lhs.errorMessage != rhs.errorMessage {return false} if lhs.unknownFields != rhs.unknownFields {return false} diff --git a/Sources/GRPCReflectionService/Model/reflection.proto b/Sources/GRPCReflectionService/Model/reflection.proto index 839a0e3af..c540fe365 100644 --- a/Sources/GRPCReflectionService/Model/reflection.proto +++ b/Sources/GRPCReflectionService/Model/reflection.proto @@ -21,7 +21,7 @@ syntax = "proto3"; -package reflection; +package grpc.reflection.v1; service ServerReflection { // The reflection service is structured as a bidirectional stream, ensuring diff --git a/Sources/GRPCReflectionService/Server/ReflectionService.swift b/Sources/GRPCReflectionService/Server/ReflectionService.swift index 190117e76..40450c767 100644 --- a/Sources/GRPCReflectionService/Server/ReflectionService.swift +++ b/Sources/GRPCReflectionService/Server/ReflectionService.swift @@ -204,7 +204,7 @@ internal struct ReflectionServiceData: Sendable { } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsyncProvider { +internal final class ReflectionServiceProvider: Grpc_Reflection_V1_ServerReflectionAsyncProvider { private let protoRegistry: ReflectionServiceData internal init(fileDescriptorProtos: [Google_Protobuf_FileDescriptorProto]) throws { @@ -215,11 +215,11 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync internal func _findFileByFileName( _ fileName: String - ) -> Result { + ) -> Result { return self.protoRegistry .serialisedFileDescriptorProtosForDependenciesOfFile(named: fileName) .map { fileDescriptorProtos in - Reflection_ServerReflectionResponse.OneOf_MessageResponse.fileDescriptorResponse( + Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse.fileDescriptorResponse( .with { $0.fileDescriptorProto = fileDescriptorProtos } @@ -229,22 +229,22 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync internal func findFileByFileName( _ fileName: String, - request: Reflection_ServerReflectionRequest - ) -> Reflection_ServerReflectionResponse { + request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Grpc_Reflection_V1_ServerReflectionResponse { let result = self._findFileByFileName(fileName) return result.makeResponse(request: request) } internal func getServicesNames( - request: Reflection_ServerReflectionRequest - ) throws -> Reflection_ServerReflectionResponse { - var listServicesResponse = Reflection_ListServiceResponse() + request: Grpc_Reflection_V1_ServerReflectionRequest + ) throws -> Grpc_Reflection_V1_ServerReflectionResponse { + var listServicesResponse = Grpc_Reflection_V1_ListServiceResponse() listServicesResponse.service = self.protoRegistry.serviceNames.map { serviceName in - Reflection_ServiceResponse.with { + Grpc_Reflection_V1_ServiceResponse.with { $0.name = serviceName } } - return Reflection_ServerReflectionResponse( + return Grpc_Reflection_V1_ServerReflectionResponse( request: request, messageResponse: .listServicesResponse(listServicesResponse) ) @@ -252,8 +252,8 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync internal func findFileBySymbol( _ symbolName: String, - request: Reflection_ServerReflectionRequest - ) -> Reflection_ServerReflectionResponse { + request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Grpc_Reflection_V1_ServerReflectionResponse { let result = self.protoRegistry.nameOfFileContainingSymbol( named: symbolName ).flatMap { @@ -263,9 +263,9 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync } internal func findFileByExtension( - extensionRequest: Reflection_ExtensionRequest, - request: Reflection_ServerReflectionRequest - ) -> Reflection_ServerReflectionResponse { + extensionRequest: Grpc_Reflection_V1_ExtensionRequest, + request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Grpc_Reflection_V1_ServerReflectionResponse { let result = self.protoRegistry.nameOfFileContainingExtension( extendeeName: extensionRequest.containingType, fieldNumber: extensionRequest.extensionNumber @@ -277,13 +277,13 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync internal func findExtensionsFieldNumbersOfType( named typeName: String, - request: Reflection_ServerReflectionRequest - ) -> Reflection_ServerReflectionResponse { + request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Grpc_Reflection_V1_ServerReflectionResponse { let result = self.protoRegistry.extensionsFieldNumbersOfType( named: typeName ).map { fieldNumbers in - Reflection_ServerReflectionResponse.OneOf_MessageResponse.allExtensionNumbersResponse( - Reflection_ExtensionNumberResponse.with { + Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse.allExtensionNumbersResponse( + Grpc_Reflection_V1_ExtensionNumberResponse.with { $0.baseTypeName = typeName $0.extensionNumber = fieldNumbers } @@ -293,8 +293,8 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync } internal func serverReflectionInfo( - requestStream: GRPCAsyncRequestStream, - responseStream: GRPCAsyncResponseStreamWriter, + requestStream: GRPCAsyncRequestStream, + responseStream: GRPCAsyncResponseStreamWriter, context: GRPCAsyncServerCallContext ) async throws { for try await request in requestStream { @@ -332,10 +332,10 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync try await responseStream.send(response) default: - let response = Reflection_ServerReflectionResponse( + let response = Grpc_Reflection_V1_ServerReflectionResponse( request: request, messageResponse: .errorResponse( - Reflection_ErrorResponse.with { + Grpc_Reflection_V1_ErrorResponse.with { $0.errorCode = Int32(GRPCStatus.Code.unimplemented.rawValue) $0.errorMessage = "The request is not implemented." } @@ -347,10 +347,10 @@ internal final class ReflectionServiceProvider: Reflection_ServerReflectionAsync } } -extension Reflection_ServerReflectionResponse { +extension Grpc_Reflection_V1_ServerReflectionResponse { init( - request: Reflection_ServerReflectionRequest, - messageResponse: Reflection_ServerReflectionResponse.OneOf_MessageResponse + request: Grpc_Reflection_V1_ServerReflectionRequest, + messageResponse: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse ) { self = .with { $0.validHost = request.host @@ -394,10 +394,11 @@ extension Google_Protobuf_FileDescriptorProto { } } -extension Result { - func recover() -> Result { +extension Result { + func recover() -> Result + { self.flatMapError { status in - let error = Reflection_ErrorResponse.with { + let error = Grpc_Reflection_V1_ErrorResponse.with { $0.errorCode = Int32(status.code.rawValue) $0.errorMessage = status.message ?? "" } @@ -406,20 +407,21 @@ extension Result Reflection_ServerReflectionResponse { + request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Grpc_Reflection_V1_ServerReflectionResponse { let result = self.recover().attachRequest(request) // Safe to '!' as the failure type is 'Never'. return try! result.get() } } -extension Result where Success == Reflection_ServerReflectionResponse.OneOf_MessageResponse { +extension Result +where Success == Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse { func attachRequest( - _ request: Reflection_ServerReflectionRequest - ) -> Result { + _ request: Grpc_Reflection_V1_ServerReflectionRequest + ) -> Result { self.map { message in - Reflection_ServerReflectionResponse(request: request, messageResponse: message) + Grpc_Reflection_V1_ServerReflectionResponse(request: request, messageResponse: message) } } } diff --git a/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.grpc.swift b/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.grpc.swift index ade12d796..57a605e77 100644 --- a/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.grpc.swift +++ b/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.grpc.swift @@ -11,20 +11,20 @@ import NIOConcurrencyHelpers import SwiftProtobuf -/// Usage: instantiate `Reflection_ServerReflectionClient`, then call methods of this protocol to make API calls. -internal protocol Reflection_ServerReflectionClientProtocol: GRPCClient { +/// Usage: instantiate `Grpc_Reflection_V1_ServerReflectionClient`, then call methods of this protocol to make API calls. +internal protocol Grpc_Reflection_V1_ServerReflectionClientProtocol: GRPCClient { var serviceName: String { get } - var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? { get } + var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? { get } func serverReflectionInfo( callOptions: CallOptions?, - handler: @escaping (Reflection_ServerReflectionResponse) -> Void - ) -> BidirectionalStreamingCall + handler: @escaping (Grpc_Reflection_V1_ServerReflectionResponse) -> Void + ) -> BidirectionalStreamingCall } -extension Reflection_ServerReflectionClientProtocol { +extension Grpc_Reflection_V1_ServerReflectionClientProtocol { internal var serviceName: String { - return "reflection.ServerReflection" + return "grpc.reflection.v1.ServerReflection" } /// The reflection service is structured as a bidirectional stream, ensuring @@ -39,10 +39,10 @@ extension Reflection_ServerReflectionClientProtocol { /// - Returns: A `ClientStreamingCall` with futures for the metadata and status. internal func serverReflectionInfo( callOptions: CallOptions? = nil, - handler: @escaping (Reflection_ServerReflectionResponse) -> Void - ) -> BidirectionalStreamingCall { + handler: @escaping (Grpc_Reflection_V1_ServerReflectionResponse) -> Void + ) -> BidirectionalStreamingCall { return self.makeBidirectionalStreamingCall( - path: Reflection_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, + path: Grpc_Reflection_V1_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, callOptions: callOptions ?? self.defaultCallOptions, interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [], handler: handler @@ -51,24 +51,24 @@ extension Reflection_ServerReflectionClientProtocol { } @available(*, deprecated) -extension Reflection_ServerReflectionClient: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionClient: @unchecked Sendable {} -@available(*, deprecated, renamed: "Reflection_ServerReflectionNIOClient") -internal final class Reflection_ServerReflectionClient: Reflection_ServerReflectionClientProtocol { +@available(*, deprecated, renamed: "Grpc_Reflection_V1_ServerReflectionNIOClient") +internal final class Grpc_Reflection_V1_ServerReflectionClient: Grpc_Reflection_V1_ServerReflectionClientProtocol { private let lock = Lock() private var _defaultCallOptions: CallOptions - private var _interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? + private var _interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? internal let channel: GRPCChannel internal var defaultCallOptions: CallOptions { get { self.lock.withLock { return self._defaultCallOptions } } set { self.lock.withLockVoid { self._defaultCallOptions = newValue } } } - internal var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? { + internal var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? { get { self.lock.withLock { return self._interceptors } } set { self.lock.withLockVoid { self._interceptors = newValue } } } - /// Creates a client for the reflection.ServerReflection service. + /// Creates a client for the grpc.reflection.v1.ServerReflection service. /// /// - Parameters: /// - channel: `GRPCChannel` to the service host. @@ -77,7 +77,7 @@ internal final class Reflection_ServerReflectionClient: Reflection_ServerReflect internal init( channel: GRPCChannel, defaultCallOptions: CallOptions = CallOptions(), - interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? = nil + interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? = nil ) { self.channel = channel self._defaultCallOptions = defaultCallOptions @@ -85,12 +85,12 @@ internal final class Reflection_ServerReflectionClient: Reflection_ServerReflect } } -internal struct Reflection_ServerReflectionNIOClient: Reflection_ServerReflectionClientProtocol { +internal struct Grpc_Reflection_V1_ServerReflectionNIOClient: Grpc_Reflection_V1_ServerReflectionClientProtocol { internal var channel: GRPCChannel internal var defaultCallOptions: CallOptions - internal var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? + internal var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? - /// Creates a client for the reflection.ServerReflection service. + /// Creates a client for the grpc.reflection.v1.ServerReflection service. /// /// - Parameters: /// - channel: `GRPCChannel` to the service host. @@ -99,7 +99,7 @@ internal struct Reflection_ServerReflectionNIOClient: Reflection_ServerReflectio internal init( channel: GRPCChannel, defaultCallOptions: CallOptions = CallOptions(), - interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? = nil + interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? = nil ) { self.channel = channel self.defaultCallOptions = defaultCallOptions @@ -108,30 +108,30 @@ internal struct Reflection_ServerReflectionNIOClient: Reflection_ServerReflectio } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -internal protocol Reflection_ServerReflectionAsyncClientProtocol: GRPCClient { +internal protocol Grpc_Reflection_V1_ServerReflectionAsyncClientProtocol: GRPCClient { static var serviceDescriptor: GRPCServiceDescriptor { get } - var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? { get } + var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? { get } func makeServerReflectionInfoCall( callOptions: CallOptions? - ) -> GRPCAsyncBidirectionalStreamingCall + ) -> GRPCAsyncBidirectionalStreamingCall } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -extension Reflection_ServerReflectionAsyncClientProtocol { +extension Grpc_Reflection_V1_ServerReflectionAsyncClientProtocol { internal static var serviceDescriptor: GRPCServiceDescriptor { - return Reflection_ServerReflectionClientMetadata.serviceDescriptor + return Grpc_Reflection_V1_ServerReflectionClientMetadata.serviceDescriptor } - internal var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? { + internal var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? { return nil } internal func makeServerReflectionInfoCall( callOptions: CallOptions? = nil - ) -> GRPCAsyncBidirectionalStreamingCall { + ) -> GRPCAsyncBidirectionalStreamingCall { return self.makeAsyncBidirectionalStreamingCall( - path: Reflection_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, + path: Grpc_Reflection_V1_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, callOptions: callOptions ?? self.defaultCallOptions, interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [] ) @@ -139,13 +139,13 @@ extension Reflection_ServerReflectionAsyncClientProtocol { } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -extension Reflection_ServerReflectionAsyncClientProtocol { +extension Grpc_Reflection_V1_ServerReflectionAsyncClientProtocol { internal func serverReflectionInfo( _ requests: RequestStream, callOptions: CallOptions? = nil - ) -> GRPCAsyncResponseStream where RequestStream: Sequence, RequestStream.Element == Reflection_ServerReflectionRequest { + ) -> GRPCAsyncResponseStream where RequestStream: Sequence, RequestStream.Element == Grpc_Reflection_V1_ServerReflectionRequest { return self.performAsyncBidirectionalStreamingCall( - path: Reflection_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, + path: Grpc_Reflection_V1_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, requests: requests, callOptions: callOptions ?? self.defaultCallOptions, interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [] @@ -155,9 +155,9 @@ extension Reflection_ServerReflectionAsyncClientProtocol { internal func serverReflectionInfo( _ requests: RequestStream, callOptions: CallOptions? = nil - ) -> GRPCAsyncResponseStream where RequestStream: AsyncSequence & Sendable, RequestStream.Element == Reflection_ServerReflectionRequest { + ) -> GRPCAsyncResponseStream where RequestStream: AsyncSequence & Sendable, RequestStream.Element == Grpc_Reflection_V1_ServerReflectionRequest { return self.performAsyncBidirectionalStreamingCall( - path: Reflection_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, + path: Grpc_Reflection_V1_ServerReflectionClientMetadata.Methods.serverReflectionInfo.path, requests: requests, callOptions: callOptions ?? self.defaultCallOptions, interceptors: self.interceptors?.makeServerReflectionInfoInterceptors() ?? [] @@ -166,15 +166,15 @@ extension Reflection_ServerReflectionAsyncClientProtocol { } @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) -internal struct Reflection_ServerReflectionAsyncClient: Reflection_ServerReflectionAsyncClientProtocol { +internal struct Grpc_Reflection_V1_ServerReflectionAsyncClient: Grpc_Reflection_V1_ServerReflectionAsyncClientProtocol { internal var channel: GRPCChannel internal var defaultCallOptions: CallOptions - internal var interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? + internal var interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? internal init( channel: GRPCChannel, defaultCallOptions: CallOptions = CallOptions(), - interceptors: Reflection_ServerReflectionClientInterceptorFactoryProtocol? = nil + interceptors: Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol? = nil ) { self.channel = channel self.defaultCallOptions = defaultCallOptions @@ -182,25 +182,25 @@ internal struct Reflection_ServerReflectionAsyncClient: Reflection_ServerReflect } } -internal protocol Reflection_ServerReflectionClientInterceptorFactoryProtocol: Sendable { +internal protocol Grpc_Reflection_V1_ServerReflectionClientInterceptorFactoryProtocol: Sendable { /// - Returns: Interceptors to use when invoking 'serverReflectionInfo'. - func makeServerReflectionInfoInterceptors() -> [ClientInterceptor] + func makeServerReflectionInfoInterceptors() -> [ClientInterceptor] } -internal enum Reflection_ServerReflectionClientMetadata { +internal enum Grpc_Reflection_V1_ServerReflectionClientMetadata { internal static let serviceDescriptor = GRPCServiceDescriptor( name: "ServerReflection", - fullName: "reflection.ServerReflection", + fullName: "grpc.reflection.v1.ServerReflection", methods: [ - Reflection_ServerReflectionClientMetadata.Methods.serverReflectionInfo, + Grpc_Reflection_V1_ServerReflectionClientMetadata.Methods.serverReflectionInfo, ] ) internal enum Methods { internal static let serverReflectionInfo = GRPCMethodDescriptor( name: "ServerReflectionInfo", - path: "/reflection.ServerReflection/ServerReflectionInfo", + path: "/grpc.reflection.v1.ServerReflection/ServerReflectionInfo", type: GRPCCallType.bidirectionalStreaming ) } diff --git a/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.pb.swift b/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.pb.swift index d3cabe420..281330e5f 100644 --- a/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.pb.swift +++ b/Tests/GRPCTests/GRPCReflectionServiceTests/Generated/reflection.pb.swift @@ -42,7 +42,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP } /// The message sent by the client when calling ServerReflectionInfo method. -struct Reflection_ServerReflectionRequest { +struct Grpc_Reflection_V1_ServerReflectionRequest { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -52,7 +52,7 @@ struct Reflection_ServerReflectionRequest { /// To use reflection service, the client should set one of the following /// fields in message_request. The server distinguishes requests by their /// defined field and then handles them using corresponding methods. - var messageRequest: Reflection_ServerReflectionRequest.OneOf_MessageRequest? = nil + var messageRequest: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest? = nil /// Find a proto file by the file name. var fileByFilename: String { @@ -76,10 +76,10 @@ struct Reflection_ServerReflectionRequest { /// Find the proto file which defines an extension extending the given /// message type with the given field number. - var fileContainingExtension: Reflection_ExtensionRequest { + var fileContainingExtension: Grpc_Reflection_V1_ExtensionRequest { get { if case .fileContainingExtension(let v)? = messageRequest {return v} - return Reflection_ExtensionRequest() + return Grpc_Reflection_V1_ExtensionRequest() } set {messageRequest = .fileContainingExtension(newValue)} } @@ -124,7 +124,7 @@ struct Reflection_ServerReflectionRequest { case fileContainingSymbol(String) /// Find the proto file which defines an extension extending the given /// message type with the given field number. - case fileContainingExtension(Reflection_ExtensionRequest) + case fileContainingExtension(Grpc_Reflection_V1_ExtensionRequest) /// Finds the tag numbers used by all known extensions of the given message /// type, and appends them to ExtensionNumberResponse in an undefined order. /// Its corresponding method is best-effort: it's not guaranteed that the @@ -139,7 +139,7 @@ struct Reflection_ServerReflectionRequest { case listServices(String) #if !swift(>=4.1) - static func ==(lhs: Reflection_ServerReflectionRequest.OneOf_MessageRequest, rhs: Reflection_ServerReflectionRequest.OneOf_MessageRequest) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest, rhs: Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest) -> Bool { // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every case branch when no optimizations are // enabled. https://github.com/apple/swift-protobuf/issues/1034 @@ -175,7 +175,7 @@ struct Reflection_ServerReflectionRequest { /// The type name and extension number sent by the client when requesting /// file_containing_extension. -struct Reflection_ExtensionRequest { +struct Grpc_Reflection_V1_ExtensionRequest { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -191,15 +191,15 @@ struct Reflection_ExtensionRequest { } /// The message sent by the server to answer ServerReflectionInfo method. -struct Reflection_ServerReflectionResponse { +struct Grpc_Reflection_V1_ServerReflectionResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. var validHost: String = String() - var originalRequest: Reflection_ServerReflectionRequest { - get {return _originalRequest ?? Reflection_ServerReflectionRequest()} + var originalRequest: Grpc_Reflection_V1_ServerReflectionRequest { + get {return _originalRequest ?? Grpc_Reflection_V1_ServerReflectionRequest()} set {_originalRequest = newValue} } /// Returns true if `originalRequest` has been explicitly set. @@ -209,7 +209,7 @@ struct Reflection_ServerReflectionResponse { /// The server sets one of the following fields according to the message_request /// in the request. - var messageResponse: Reflection_ServerReflectionResponse.OneOf_MessageResponse? = nil + var messageResponse: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse? = nil /// This message is used to answer file_by_filename, file_containing_symbol, /// file_containing_extension requests with transitive dependencies. @@ -217,37 +217,37 @@ struct Reflection_ServerReflectionResponse { /// FileDescriptorResponse message to encapsulate the repeated fields. /// The reflection service is allowed to avoid sending FileDescriptorProtos /// that were previously sent in response to earlier requests in the stream. - var fileDescriptorResponse: Reflection_FileDescriptorResponse { + var fileDescriptorResponse: Grpc_Reflection_V1_FileDescriptorResponse { get { if case .fileDescriptorResponse(let v)? = messageResponse {return v} - return Reflection_FileDescriptorResponse() + return Grpc_Reflection_V1_FileDescriptorResponse() } set {messageResponse = .fileDescriptorResponse(newValue)} } /// This message is used to answer all_extension_numbers_of_type requests. - var allExtensionNumbersResponse: Reflection_ExtensionNumberResponse { + var allExtensionNumbersResponse: Grpc_Reflection_V1_ExtensionNumberResponse { get { if case .allExtensionNumbersResponse(let v)? = messageResponse {return v} - return Reflection_ExtensionNumberResponse() + return Grpc_Reflection_V1_ExtensionNumberResponse() } set {messageResponse = .allExtensionNumbersResponse(newValue)} } /// This message is used to answer list_services requests. - var listServicesResponse: Reflection_ListServiceResponse { + var listServicesResponse: Grpc_Reflection_V1_ListServiceResponse { get { if case .listServicesResponse(let v)? = messageResponse {return v} - return Reflection_ListServiceResponse() + return Grpc_Reflection_V1_ListServiceResponse() } set {messageResponse = .listServicesResponse(newValue)} } /// This message is used when an error occurs. - var errorResponse: Reflection_ErrorResponse { + var errorResponse: Grpc_Reflection_V1_ErrorResponse { get { if case .errorResponse(let v)? = messageResponse {return v} - return Reflection_ErrorResponse() + return Grpc_Reflection_V1_ErrorResponse() } set {messageResponse = .errorResponse(newValue)} } @@ -263,16 +263,16 @@ struct Reflection_ServerReflectionResponse { /// FileDescriptorResponse message to encapsulate the repeated fields. /// The reflection service is allowed to avoid sending FileDescriptorProtos /// that were previously sent in response to earlier requests in the stream. - case fileDescriptorResponse(Reflection_FileDescriptorResponse) + case fileDescriptorResponse(Grpc_Reflection_V1_FileDescriptorResponse) /// This message is used to answer all_extension_numbers_of_type requests. - case allExtensionNumbersResponse(Reflection_ExtensionNumberResponse) + case allExtensionNumbersResponse(Grpc_Reflection_V1_ExtensionNumberResponse) /// This message is used to answer list_services requests. - case listServicesResponse(Reflection_ListServiceResponse) + case listServicesResponse(Grpc_Reflection_V1_ListServiceResponse) /// This message is used when an error occurs. - case errorResponse(Reflection_ErrorResponse) + case errorResponse(Grpc_Reflection_V1_ErrorResponse) #if !swift(>=4.1) - static func ==(lhs: Reflection_ServerReflectionResponse.OneOf_MessageResponse, rhs: Reflection_ServerReflectionResponse.OneOf_MessageResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse, rhs: Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse) -> Bool { // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every case branch when no optimizations are // enabled. https://github.com/apple/swift-protobuf/issues/1034 @@ -301,13 +301,13 @@ struct Reflection_ServerReflectionResponse { init() {} - fileprivate var _originalRequest: Reflection_ServerReflectionRequest? = nil + fileprivate var _originalRequest: Grpc_Reflection_V1_ServerReflectionRequest? = nil } /// Serialized FileDescriptorProto messages sent by the server answering /// a file_by_filename, file_containing_symbol, or file_containing_extension /// request. -struct Reflection_FileDescriptorResponse { +struct Grpc_Reflection_V1_FileDescriptorResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -324,7 +324,7 @@ struct Reflection_FileDescriptorResponse { /// A list of extension numbers sent by the server answering /// all_extension_numbers_of_type request. -struct Reflection_ExtensionNumberResponse { +struct Grpc_Reflection_V1_ExtensionNumberResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -341,14 +341,14 @@ struct Reflection_ExtensionNumberResponse { } /// A list of ServiceResponse sent by the server answering list_services request. -struct Reflection_ListServiceResponse { +struct Grpc_Reflection_V1_ListServiceResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. /// The information of each service may be expanded in the future, so we use /// ServiceResponse message to encapsulate it. - var service: [Reflection_ServiceResponse] = [] + var service: [Grpc_Reflection_V1_ServiceResponse] = [] var unknownFields = SwiftProtobuf.UnknownStorage() @@ -357,7 +357,7 @@ struct Reflection_ListServiceResponse { /// The information of a single service used by ListServiceResponse to answer /// list_services request. -struct Reflection_ServiceResponse { +struct Grpc_Reflection_V1_ServiceResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -372,7 +372,7 @@ struct Reflection_ServiceResponse { } /// The error code and error message sent by the server when an error occurs. -struct Reflection_ErrorResponse { +struct Grpc_Reflection_V1_ErrorResponse { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -388,23 +388,23 @@ struct Reflection_ErrorResponse { } #if swift(>=5.5) && canImport(_Concurrency) -extension Reflection_ServerReflectionRequest: @unchecked Sendable {} -extension Reflection_ServerReflectionRequest.OneOf_MessageRequest: @unchecked Sendable {} -extension Reflection_ExtensionRequest: @unchecked Sendable {} -extension Reflection_ServerReflectionResponse: @unchecked Sendable {} -extension Reflection_ServerReflectionResponse.OneOf_MessageResponse: @unchecked Sendable {} -extension Reflection_FileDescriptorResponse: @unchecked Sendable {} -extension Reflection_ExtensionNumberResponse: @unchecked Sendable {} -extension Reflection_ListServiceResponse: @unchecked Sendable {} -extension Reflection_ServiceResponse: @unchecked Sendable {} -extension Reflection_ErrorResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionRequest.OneOf_MessageRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ExtensionRequest: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServerReflectionResponse.OneOf_MessageResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_FileDescriptorResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ExtensionNumberResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ListServiceResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ServiceResponse: @unchecked Sendable {} +extension Grpc_Reflection_V1_ErrorResponse: @unchecked Sendable {} #endif // swift(>=5.5) && canImport(_Concurrency) // MARK: - Code below here is support for the SwiftProtobuf runtime. -fileprivate let _protobuf_package = "reflection" +fileprivate let _protobuf_package = "grpc.reflection.v1" -extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ServerReflectionRequest" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "host"), @@ -439,7 +439,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob } }() case 5: try { - var v: Reflection_ExtensionRequest? + var v: Grpc_Reflection_V1_ExtensionRequest? var hadOneofValue = false if let current = self.messageRequest { hadOneofValue = true @@ -506,7 +506,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ServerReflectionRequest, rhs: Reflection_ServerReflectionRequest) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ServerReflectionRequest, rhs: Grpc_Reflection_V1_ServerReflectionRequest) -> Bool { if lhs.host != rhs.host {return false} if lhs.messageRequest != rhs.messageRequest {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -514,7 +514,7 @@ extension Reflection_ServerReflectionRequest: SwiftProtobuf.Message, SwiftProtob } } -extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ExtensionRequest" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "containing_type"), @@ -544,7 +544,7 @@ extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ExtensionRequest, rhs: Reflection_ExtensionRequest) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ExtensionRequest, rhs: Grpc_Reflection_V1_ExtensionRequest) -> Bool { if lhs.containingType != rhs.containingType {return false} if lhs.extensionNumber != rhs.extensionNumber {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -552,7 +552,7 @@ extension Reflection_ExtensionRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes } } -extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ServerReflectionResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "valid_host"), @@ -572,7 +572,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto case 1: try { try decoder.decodeSingularStringField(value: &self.validHost) }() case 2: try { try decoder.decodeSingularMessageField(value: &self._originalRequest) }() case 4: try { - var v: Reflection_FileDescriptorResponse? + var v: Grpc_Reflection_V1_FileDescriptorResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -585,7 +585,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 5: try { - var v: Reflection_ExtensionNumberResponse? + var v: Grpc_Reflection_V1_ExtensionNumberResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -598,7 +598,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 6: try { - var v: Reflection_ListServiceResponse? + var v: Grpc_Reflection_V1_ListServiceResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -611,7 +611,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } }() case 7: try { - var v: Reflection_ErrorResponse? + var v: Grpc_Reflection_V1_ErrorResponse? var hadOneofValue = false if let current = self.messageResponse { hadOneofValue = true @@ -661,7 +661,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ServerReflectionResponse, rhs: Reflection_ServerReflectionResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ServerReflectionResponse, rhs: Grpc_Reflection_V1_ServerReflectionResponse) -> Bool { if lhs.validHost != rhs.validHost {return false} if lhs._originalRequest != rhs._originalRequest {return false} if lhs.messageResponse != rhs.messageResponse {return false} @@ -670,7 +670,7 @@ extension Reflection_ServerReflectionResponse: SwiftProtobuf.Message, SwiftProto } } -extension Reflection_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".FileDescriptorResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "file_descriptor_proto"), @@ -695,14 +695,14 @@ extension Reflection_FileDescriptorResponse: SwiftProtobuf.Message, SwiftProtobu try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_FileDescriptorResponse, rhs: Reflection_FileDescriptorResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_FileDescriptorResponse, rhs: Grpc_Reflection_V1_FileDescriptorResponse) -> Bool { if lhs.fileDescriptorProto != rhs.fileDescriptorProto {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ExtensionNumberResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "base_type_name"), @@ -732,7 +732,7 @@ extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtob try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ExtensionNumberResponse, rhs: Reflection_ExtensionNumberResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ExtensionNumberResponse, rhs: Grpc_Reflection_V1_ExtensionNumberResponse) -> Bool { if lhs.baseTypeName != rhs.baseTypeName {return false} if lhs.extensionNumber != rhs.extensionNumber {return false} if lhs.unknownFields != rhs.unknownFields {return false} @@ -740,7 +740,7 @@ extension Reflection_ExtensionNumberResponse: SwiftProtobuf.Message, SwiftProtob } } -extension Reflection_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ListServiceResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "service"), @@ -765,14 +765,14 @@ extension Reflection_ListServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._ try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ListServiceResponse, rhs: Reflection_ListServiceResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ListServiceResponse, rhs: Grpc_Reflection_V1_ListServiceResponse) -> Bool { if lhs.service != rhs.service {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ServiceResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "name"), @@ -797,14 +797,14 @@ extension Reflection_ServiceResponse: SwiftProtobuf.Message, SwiftProtobuf._Mess try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ServiceResponse, rhs: Reflection_ServiceResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ServiceResponse, rhs: Grpc_Reflection_V1_ServiceResponse) -> Bool { if lhs.name != rhs.name {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } } -extension Reflection_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { +extension Grpc_Reflection_V1_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ErrorResponse" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "error_code"), @@ -834,7 +834,7 @@ extension Reflection_ErrorResponse: SwiftProtobuf.Message, SwiftProtobuf._Messag try unknownFields.traverse(visitor: &visitor) } - static func ==(lhs: Reflection_ErrorResponse, rhs: Reflection_ErrorResponse) -> Bool { + static func ==(lhs: Grpc_Reflection_V1_ErrorResponse, rhs: Grpc_Reflection_V1_ErrorResponse) -> Bool { if lhs.errorCode != rhs.errorCode {return false} if lhs.errorMessage != rhs.errorMessage {return false} if lhs.unknownFields != rhs.unknownFields {return false} diff --git a/Tests/GRPCTests/GRPCReflectionServiceTests/ReflectionServiceIntegrationTests.swift b/Tests/GRPCTests/GRPCReflectionServiceTests/ReflectionServiceIntegrationTests.swift index b3b685813..29b3c6aa4 100644 --- a/Tests/GRPCTests/GRPCReflectionServiceTests/ReflectionServiceIntegrationTests.swift +++ b/Tests/GRPCTests/GRPCReflectionServiceTests/ReflectionServiceIntegrationTests.swift @@ -68,7 +68,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testFileByFileName() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( .with { @@ -104,7 +104,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testListServices() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( @@ -128,7 +128,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testFileBySymbol() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( @@ -177,7 +177,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testFileByExtension() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( @@ -241,7 +241,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testAllExtensionNumbersOfType() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( @@ -262,7 +262,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testErrorResponseFileByFileNameRequest() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( .with { @@ -285,7 +285,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testErrorResponseFileBySymbolRequest() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( .with { @@ -305,7 +305,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testErrorResponseFileByExtensionRequest() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( .with { @@ -328,7 +328,7 @@ final class ReflectionServiceIntegrationTests: GRPCTestCase { func testErrorResponseAllExtensionNumbersOfTypeRequest() async throws { try self.setUpServerAndChannel() - let client = Reflection_ServerReflectionAsyncClient(channel: self.channel!) + let client = Grpc_Reflection_V1_ServerReflectionAsyncClient(channel: self.channel!) let serviceReflectionInfo = client.makeServerReflectionInfoCall() try await serviceReflectionInfo.requestStream.send( .with {