Skip to content

Add an underscore between generated service name and component #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Add an underscore between generated service name and component #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ let targets: [Target] = [
name: "GRPCCoreTests",
dependencies: [
.target(name: "GRPCCore"),
.target(name: "GRPCInProcessTransport"),
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
resources: [
Expand Down
4 changes: 2 additions & 2 deletions Sources/GRPCCodeGen/Internal/Translator/ClientCodeTranslator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ extension ClientCodeTranslator {
let clientProtocol = Declaration.protocol(
ProtocolDescription(
accessModifier: self.accessModifier,
name: "\(service.namespacedGeneratedName)ClientProtocol",
name: "\(service.namespacedGeneratedName)_ClientProtocol",
conformances: ["Sendable"],
members: methods
)
Expand Down Expand Up @@ -592,7 +592,7 @@ extension ClientCodeTranslator {
.struct(
StructDescription(
accessModifier: self.accessModifier,
name: "\(service.namespacedGeneratedName)Client",
name: "\(service.namespacedGeneratedName)_Client",
conformances: ["\(service.namespacedGeneratedName).ClientProtocol"],
members: [clientProperty, initializer] + methods
)
Expand Down
4 changes: 2 additions & 2 deletions Sources/GRPCCodeGen/Internal/Translator/ServerCodeTranslator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ extension ServerCodeTranslator {
streaming: Bool
) -> String {
if streaming {
return "\(service.namespacedGeneratedName)StreamingServiceProtocol"
return "\(service.namespacedGeneratedName)_StreamingServiceProtocol"
}
return "\(service.namespacedGeneratedName)ServiceProtocol"
return "\(service.namespacedGeneratedName)_ServiceProtocol"
}
}
8 changes: 4 additions & 4 deletions Sources/GRPCCodeGen/Internal/Translator/TypealiasTranslator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,12 @@ extension TypealiasTranslator {
let streamingServiceProtocolTypealias = Declaration.typealias(
accessModifier: self.accessModifier,
name: "StreamingServiceProtocol",
existingType: .member("\(service.namespacedGeneratedName)StreamingServiceProtocol")
existingType: .member("\(service.namespacedGeneratedName)_StreamingServiceProtocol")
)
let serviceProtocolTypealias = Declaration.typealias(
accessModifier: self.accessModifier,
name: "ServiceProtocol",
existingType: .member("\(service.namespacedGeneratedName)ServiceProtocol")
existingType: .member("\(service.namespacedGeneratedName)_ServiceProtocol")
)

return [
Expand All @@ -284,7 +284,7 @@ extension TypealiasTranslator {
.typealias(
accessModifier: self.accessModifier,
name: "ClientProtocol",
existingType: .member("\(service.namespacedGeneratedName)ClientProtocol")
existingType: .member("\(service.namespacedGeneratedName)_ClientProtocol")
)
)
}
Expand All @@ -297,7 +297,7 @@ extension TypealiasTranslator {
.typealias(
accessModifier: self.accessModifier,
name: "Client",
existingType: .member("\(service.namespacedGeneratedName)Client")
existingType: .member("\(service.namespacedGeneratedName)_Client")
)
)
}
Expand Down
32 changes: 16 additions & 16 deletions Tests/GRPCCodeGenTests/Internal/Translator/ClientCodeTranslatorSnippetBasedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAClientProtocol: Sendable {
public protocol NamespaceA_ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Single<NamespaceA_ServiceARequest>,
Expand Down Expand Up @@ -96,7 +96,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
public struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -151,7 +151,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAClientProtocol: Sendable {
public protocol NamespaceA_ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Stream<NamespaceA_ServiceARequest>,
Expand Down Expand Up @@ -203,7 +203,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
public struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -258,7 +258,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAClientProtocol: Sendable {
public protocol NamespaceA_ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Single<NamespaceA_ServiceARequest>,
Expand Down Expand Up @@ -306,7 +306,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
public struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -359,7 +359,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAClientProtocol: Sendable {
public protocol NamespaceA_ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Stream<NamespaceA_ServiceARequest>,
Expand Down Expand Up @@ -407,7 +407,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
public struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -468,7 +468,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
package protocol NamespaceA_ServiceAClientProtocol: Sendable {
package protocol NamespaceA_ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Stream<NamespaceA_ServiceARequest>,
Expand Down Expand Up @@ -561,7 +561,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
package struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
package struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

package init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -634,7 +634,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal protocol ServiceAClientProtocol: Sendable {
internal protocol ServiceA_ClientProtocol: Sendable {
/// Documentation for MethodA
func methodA<R>(
request: GRPCCore.ClientRequest.Single<ServiceARequest>,
Expand Down Expand Up @@ -686,7 +686,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
internal struct ServiceAClient: ServiceA.ClientProtocol {
internal struct ServiceA_Client: ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

internal init(wrapping client: GRPCCore.GRPCClient) {
Expand Down Expand Up @@ -747,7 +747,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
"""
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAClientProtocol: Sendable {}
public protocol NamespaceA_ServiceA_ClientProtocol: Sendable {}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension NamespaceA_ServiceA.ClientProtocol {
}
Expand All @@ -756,7 +756,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
}
/// Documentation for ServiceA
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct NamespaceA_ServiceAClient: NamespaceA_ServiceA.ClientProtocol {
public struct NamespaceA_ServiceA_Client: NamespaceA_ServiceA.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand All @@ -767,7 +767,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
///
/// Line 2
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol ServiceBClientProtocol: Sendable {}
public protocol ServiceB_ClientProtocol: Sendable {}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension ServiceB.ClientProtocol {
}
Expand All @@ -778,7 +778,7 @@ final class ClientCodeTranslatorSnippetBasedTests: XCTestCase {
///
/// Line 2
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public struct ServiceBClient: ServiceB.ClientProtocol {
public struct ServiceB_Client: ServiceB.ClientProtocol {
private let client: GRPCCore.GRPCClient

public init(wrapping client: GRPCCore.GRPCClient) {
Expand Down
10 changes: 5 additions & 5 deletions ...RPCCodeGenTests/Internal/Translator/IDLToStructuredSwiftTranslatorSnippetBasedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
public static let descriptors: [GRPCCore.MethodDescriptor] = []
}
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public typealias StreamingServiceProtocol = NamespaceA_ServiceAStreamingServiceProtocol
public typealias StreamingServiceProtocol = NamespaceA_ServiceA_StreamingServiceProtocol
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public typealias ServiceProtocol = NamespaceA_ServiceAServiceProtocol
public typealias ServiceProtocol = NamespaceA_ServiceA_ServiceProtocol
}

extension GRPCCore.ServiceDescriptor {
Expand All @@ -236,7 +236,7 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {

/// Documentation for AService
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAStreamingServiceProtocol: GRPCCore.RegistrableRPCService {}
public protocol NamespaceA_ServiceA_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {}

/// Conformance to `GRPCCore.RegistrableRPCService`.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
Expand All @@ -247,9 +247,9 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {

/// Documentation for AService
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public protocol NamespaceA_ServiceAServiceProtocol: NamespaceA_ServiceA.StreamingServiceProtocol {}
public protocol NamespaceA_ServiceA_ServiceProtocol: NamespaceA_ServiceA.StreamingServiceProtocol {}

/// Partial conformance to `NamespaceA_ServiceAStreamingServiceProtocol`.
/// Partial conformance to `NamespaceA_ServiceA_StreamingServiceProtocol`.
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
extension NamespaceA_ServiceA.ServiceProtocol {
}
Expand Down
Loading
Loading