Skip to content

Commit 5fd09c3

Browse files
dbolducdbolduc
authored
refactor(generator): consolidate some stub member functions (#10473)
1 parent 8417925 commit 5fd09c3

21 files changed

+349
-590
lines changed

‎generator/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ add_library(
8383
internal/stub_factory_rest_generator.h
8484
internal/stub_generator.cc
8585
internal/stub_generator.h
86+
internal/stub_generator_base.cc
87+
internal/stub_generator_base.h
8688
internal/stub_rest_generator.cc
8789
internal/stub_rest_generator.h)
8890
target_include_directories(google_cloud_cpp_generator

‎generator/google_cloud_cpp_generator.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ google_cloud_cpp_generator_hdrs = [
4848
"internal/stub_factory_generator.h",
4949
"internal/stub_factory_rest_generator.h",
5050
"internal/stub_generator.h",
51+
"internal/stub_generator_base.h",
5152
"internal/stub_rest_generator.h",
5253
]
5354

@@ -81,5 +82,6 @@ google_cloud_cpp_generator_srcs = [
8182
"internal/stub_factory_generator.cc",
8283
"internal/stub_factory_rest_generator.cc",
8384
"internal/stub_generator.cc",
85+
"internal/stub_generator_base.cc",
8486
"internal/stub_rest_generator.cc",
8587
]

‎generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,37 @@ class GoldenKitchenSinkLogging : public GoldenKitchenSinkStub {
3939
std::set<std::string> components);
4040

4141
StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse> GenerateAccessToken(
42-
grpc::ClientContext& context,
43-
google::test::admin::database::v1::GenerateAccessTokenRequest const& request) override;
42+
grpc::ClientContext& context,
43+
google::test::admin::database::v1::GenerateAccessTokenRequest const& request) override;
4444

4545
StatusOr<google::test::admin::database::v1::GenerateIdTokenResponse> GenerateIdToken(
46-
grpc::ClientContext& context,
47-
google::test::admin::database::v1::GenerateIdTokenRequest const& request) override;
46+
grpc::ClientContext& context,
47+
google::test::admin::database::v1::GenerateIdTokenRequest const& request) override;
4848

4949
StatusOr<google::test::admin::database::v1::WriteLogEntriesResponse> WriteLogEntries(
50-
grpc::ClientContext& context,
51-
google::test::admin::database::v1::WriteLogEntriesRequest const& request) override;
50+
grpc::ClientContext& context,
51+
google::test::admin::database::v1::WriteLogEntriesRequest const& request) override;
5252

5353
StatusOr<google::test::admin::database::v1::ListLogsResponse> ListLogs(
54-
grpc::ClientContext& context,
55-
google::test::admin::database::v1::ListLogsRequest const& request) override;
54+
grpc::ClientContext& context,
55+
google::test::admin::database::v1::ListLogsRequest const& request) override;
5656

5757
StatusOr<google::test::admin::database::v1::ListServiceAccountKeysResponse> ListServiceAccountKeys(
58-
grpc::ClientContext& context,
59-
google::test::admin::database::v1::ListServiceAccountKeysRequest const& request) override;
58+
grpc::ClientContext& context,
59+
google::test::admin::database::v1::ListServiceAccountKeysRequest const& request) override;
6060

6161
Status DoNothing(
62-
grpc::ClientContext& context,
63-
google::protobuf::Empty const& request) override;
62+
grpc::ClientContext& context,
63+
google::protobuf::Empty const& request) override;
6464

6565
std::unique_ptr<google::cloud::internal::StreamingReadRpc<google::test::admin::database::v1::Response>>
6666
StreamingRead(
67-
std::unique_ptr<grpc::ClientContext> context,
68-
google::test::admin::database::v1::Request const& request) override;
67+
std::unique_ptr<grpc::ClientContext> context,
68+
google::test::admin::database::v1::Request const& request) override;
6969

7070
std::unique_ptr<::google::cloud::internal::StreamingWriteRpc<
7171
google::test::admin::database::v1::Request,
72-
google::test::admin::database::v1::Response>>
73-
StreamingWrite(
72+
google::test::admin::database::v1::Response>> StreamingWrite(
7473
std::unique_ptr<grpc::ClientContext> context) override;
7574

7675
std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
@@ -81,12 +80,12 @@ class GoldenKitchenSinkLogging : public GoldenKitchenSinkStub {
8180
std::unique_ptr<grpc::ClientContext> context) override;
8281

8382
Status ExplicitRouting1(
84-
grpc::ClientContext& context,
85-
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
83+
grpc::ClientContext& context,
84+
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
8685

8786
Status ExplicitRouting2(
88-
grpc::ClientContext& context,
89-
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
87+
grpc::ClientContext& context,
88+
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
9089

9190
std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
9291
google::test::admin::database::v1::Response>>

‎generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,37 @@ class GoldenKitchenSinkMetadata : public GoldenKitchenSinkStub {
3535
explicit GoldenKitchenSinkMetadata(std::shared_ptr<GoldenKitchenSinkStub> child);
3636

3737
StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse> GenerateAccessToken(
38-
grpc::ClientContext& context,
39-
google::test::admin::database::v1::GenerateAccessTokenRequest const& request) override;
38+
grpc::ClientContext& context,
39+
google::test::admin::database::v1::GenerateAccessTokenRequest const& request) override;
4040

4141
StatusOr<google::test::admin::database::v1::GenerateIdTokenResponse> GenerateIdToken(
42-
grpc::ClientContext& context,
43-
google::test::admin::database::v1::GenerateIdTokenRequest const& request) override;
42+
grpc::ClientContext& context,
43+
google::test::admin::database::v1::GenerateIdTokenRequest const& request) override;
4444

4545
StatusOr<google::test::admin::database::v1::WriteLogEntriesResponse> WriteLogEntries(
46-
grpc::ClientContext& context,
47-
google::test::admin::database::v1::WriteLogEntriesRequest const& request) override;
46+
grpc::ClientContext& context,
47+
google::test::admin::database::v1::WriteLogEntriesRequest const& request) override;
4848

4949
StatusOr<google::test::admin::database::v1::ListLogsResponse> ListLogs(
50-
grpc::ClientContext& context,
51-
google::test::admin::database::v1::ListLogsRequest const& request) override;
50+
grpc::ClientContext& context,
51+
google::test::admin::database::v1::ListLogsRequest const& request) override;
5252

5353
StatusOr<google::test::admin::database::v1::ListServiceAccountKeysResponse> ListServiceAccountKeys(
54-
grpc::ClientContext& context,
55-
google::test::admin::database::v1::ListServiceAccountKeysRequest const& request) override;
54+
grpc::ClientContext& context,
55+
google::test::admin::database::v1::ListServiceAccountKeysRequest const& request) override;
5656

5757
Status DoNothing(
58-
grpc::ClientContext& context,
59-
google::protobuf::Empty const& request) override;
58+
grpc::ClientContext& context,
59+
google::protobuf::Empty const& request) override;
6060

6161
std::unique_ptr<google::cloud::internal::StreamingReadRpc<google::test::admin::database::v1::Response>>
62-
StreamingRead(
63-
std::unique_ptr<grpc::ClientContext> context,
64-
google::test::admin::database::v1::Request const& request) override;
62+
StreamingRead(
63+
std::unique_ptr<grpc::ClientContext> context,
64+
google::test::admin::database::v1::Request const& request) override;
6565

6666
std::unique_ptr<::google::cloud::internal::StreamingWriteRpc<
6767
google::test::admin::database::v1::Request,
68-
google::test::admin::database::v1::Response>>
69-
StreamingWrite(
68+
google::test::admin::database::v1::Response>> StreamingWrite(
7069
std::unique_ptr<grpc::ClientContext> context) override;
7170

7271
std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
@@ -77,12 +76,12 @@ class GoldenKitchenSinkMetadata : public GoldenKitchenSinkStub {
7776
std::unique_ptr<grpc::ClientContext> context) override;
7877

7978
Status ExplicitRouting1(
80-
grpc::ClientContext& context,
81-
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
79+
grpc::ClientContext& context,
80+
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
8281

8382
Status ExplicitRouting2(
84-
grpc::ClientContext& context,
85-
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
83+
grpc::ClientContext& context,
84+
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
8685

8786
std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
8887
google::test::admin::database::v1::Response>>

‎generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,12 @@ class GoldenKitchenSinkRoundRobin : public GoldenKitchenSinkStub {
6565
std::unique_ptr<grpc::ClientContext> context,
6666
google::test::admin::database::v1::Request const& request) override;
6767

68-
std::unique_ptr<google::cloud::internal::StreamingWriteRpc<
68+
std::unique_ptr<::google::cloud::internal::StreamingWriteRpc<
6969
google::test::admin::database::v1::Request,
70-
google::test::admin::database::v1::Response>>
71-
StreamingWrite(
70+
google::test::admin::database::v1::Response>> StreamingWrite(
7271
std::unique_ptr<grpc::ClientContext> context) override;
7372

74-
std::unique_ptr<google::cloud::AsyncStreamingReadWriteRpc<
73+
std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
7574
google::test::admin::database::v1::Request,
7675
google::test::admin::database::v1::Response>>
7776
AsyncStreamingReadWrite(
@@ -86,16 +85,15 @@ class GoldenKitchenSinkRoundRobin : public GoldenKitchenSinkStub {
8685
grpc::ClientContext& context,
8786
google::test::admin::database::v1::ExplicitRoutingRequest const& request) override;
8887

89-
std::unique_ptr<google::cloud::internal::AsyncStreamingReadRpc<
88+
std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
9089
google::test::admin::database::v1::Response>>
9190
AsyncStreamingRead(
9291
google::cloud::CompletionQueue const& cq,
9392
std::unique_ptr<grpc::ClientContext> context,
9493
google::test::admin::database::v1::Request const& request) override;
9594

96-
std::unique_ptr<google::cloud::internal::AsyncStreamingWriteRpc<
97-
google::test::admin::database::v1::Request,
98-
google::test::admin::database::v1::Response>>
95+
std::unique_ptr<::google::cloud::internal::AsyncStreamingWriteRpc<
96+
google::test::admin::database::v1::Request, google::test::admin::database::v1::Response>>
9997
AsyncStreamingWrite(
10098
google::cloud::CompletionQueue const& cq,
10199
std::unique_ptr<grpc::ClientContext> context) override;

‎generator/integration_tests/golden/v1/internal/golden_thing_admin_auth_decorator.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class GoldenThingAdminAuth : public GoldenThingAdminStub {
135135
google::cloud::CompletionQueue& cq,
136136
std::unique_ptr<grpc::ClientContext> context,
137137
google::longrunning::CancelOperationRequest const& request) override;
138+
138139
private:
139140
std::shared_ptr<google::cloud::internal::GrpcAuthenticationStrategy> auth_;
140141
std::shared_ptr<GoldenThingAdminStub> child_;

‎generator/integration_tests/golden/v1/internal/golden_thing_admin_logging_decorator.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,101 +40,101 @@ class GoldenThingAdminLogging : public GoldenThingAdminStub {
4040
std::set<std::string> components);
4141

4242
StatusOr<google::test::admin::database::v1::ListDatabasesResponse> ListDatabases(
43-
grpc::ClientContext& context,
44-
google::test::admin::database::v1::ListDatabasesRequest const& request) override;
43+
grpc::ClientContext& context,
44+
google::test::admin::database::v1::ListDatabasesRequest const& request) override;
4545

4646
future<StatusOr<google::longrunning::Operation>> AsyncCreateDatabase(
4747
google::cloud::CompletionQueue& cq,
4848
std::unique_ptr<grpc::ClientContext> context,
4949
google::test::admin::database::v1::CreateDatabaseRequest const& request) override;
5050

5151
StatusOr<google::test::admin::database::v1::Database> GetDatabase(
52-
grpc::ClientContext& context,
53-
google::test::admin::database::v1::GetDatabaseRequest const& request) override;
52+
grpc::ClientContext& context,
53+
google::test::admin::database::v1::GetDatabaseRequest const& request) override;
5454

5555
future<StatusOr<google::longrunning::Operation>> AsyncUpdateDatabaseDdl(
5656
google::cloud::CompletionQueue& cq,
5757
std::unique_ptr<grpc::ClientContext> context,
5858
google::test::admin::database::v1::UpdateDatabaseDdlRequest const& request) override;
5959

6060
Status DropDatabase(
61-
grpc::ClientContext& context,
62-
google::test::admin::database::v1::DropDatabaseRequest const& request) override;
61+
grpc::ClientContext& context,
62+
google::test::admin::database::v1::DropDatabaseRequest const& request) override;
6363

6464
StatusOr<google::test::admin::database::v1::GetDatabaseDdlResponse> GetDatabaseDdl(
65-
grpc::ClientContext& context,
66-
google::test::admin::database::v1::GetDatabaseDdlRequest const& request) override;
65+
grpc::ClientContext& context,
66+
google::test::admin::database::v1::GetDatabaseDdlRequest const& request) override;
6767

6868
StatusOr<google::iam::v1::Policy> SetIamPolicy(
69-
grpc::ClientContext& context,
70-
google::iam::v1::SetIamPolicyRequest const& request) override;
69+
grpc::ClientContext& context,
70+
google::iam::v1::SetIamPolicyRequest const& request) override;
7171

7272
StatusOr<google::iam::v1::Policy> GetIamPolicy(
73-
grpc::ClientContext& context,
74-
google::iam::v1::GetIamPolicyRequest const& request) override;
73+
grpc::ClientContext& context,
74+
google::iam::v1::GetIamPolicyRequest const& request) override;
7575

7676
StatusOr<google::iam::v1::TestIamPermissionsResponse> TestIamPermissions(
77-
grpc::ClientContext& context,
78-
google::iam::v1::TestIamPermissionsRequest const& request) override;
77+
grpc::ClientContext& context,
78+
google::iam::v1::TestIamPermissionsRequest const& request) override;
7979

8080
future<StatusOr<google::longrunning::Operation>> AsyncCreateBackup(
8181
google::cloud::CompletionQueue& cq,
8282
std::unique_ptr<grpc::ClientContext> context,
8383
google::test::admin::database::v1::CreateBackupRequest const& request) override;
8484

8585
StatusOr<google::test::admin::database::v1::Backup> GetBackup(
86-
grpc::ClientContext& context,
87-
google::test::admin::database::v1::GetBackupRequest const& request) override;
86+
grpc::ClientContext& context,
87+
google::test::admin::database::v1::GetBackupRequest const& request) override;
8888

8989
StatusOr<google::test::admin::database::v1::Backup> UpdateBackup(
90-
grpc::ClientContext& context,
91-
google::test::admin::database::v1::UpdateBackupRequest const& request) override;
90+
grpc::ClientContext& context,
91+
google::test::admin::database::v1::UpdateBackupRequest const& request) override;
9292

9393
Status DeleteBackup(
94-
grpc::ClientContext& context,
95-
google::test::admin::database::v1::DeleteBackupRequest const& request) override;
94+
grpc::ClientContext& context,
95+
google::test::admin::database::v1::DeleteBackupRequest const& request) override;
9696

9797
StatusOr<google::test::admin::database::v1::ListBackupsResponse> ListBackups(
98-
grpc::ClientContext& context,
99-
google::test::admin::database::v1::ListBackupsRequest const& request) override;
98+
grpc::ClientContext& context,
99+
google::test::admin::database::v1::ListBackupsRequest const& request) override;
100100

101101
future<StatusOr<google::longrunning::Operation>> AsyncRestoreDatabase(
102102
google::cloud::CompletionQueue& cq,
103103
std::unique_ptr<grpc::ClientContext> context,
104104
google::test::admin::database::v1::RestoreDatabaseRequest const& request) override;
105105

106106
StatusOr<google::test::admin::database::v1::ListDatabaseOperationsResponse> ListDatabaseOperations(
107-
grpc::ClientContext& context,
108-
google::test::admin::database::v1::ListDatabaseOperationsRequest const& request) override;
107+
grpc::ClientContext& context,
108+
google::test::admin::database::v1::ListDatabaseOperationsRequest const& request) override;
109109

110110
StatusOr<google::test::admin::database::v1::ListBackupOperationsResponse> ListBackupOperations(
111-
grpc::ClientContext& context,
112-
google::test::admin::database::v1::ListBackupOperationsRequest const& request) override;
111+
grpc::ClientContext& context,
112+
google::test::admin::database::v1::ListBackupOperationsRequest const& request) override;
113113

114114
future<StatusOr<google::longrunning::Operation>> AsyncLongRunningWithoutRouting(
115115
google::cloud::CompletionQueue& cq,
116116
std::unique_ptr<grpc::ClientContext> context,
117117
google::test::admin::database::v1::RestoreDatabaseRequest const& request) override;
118118

119119
future<StatusOr<google::test::admin::database::v1::Database>> AsyncGetDatabase(
120-
google::cloud::CompletionQueue& cq,
121-
std::unique_ptr<grpc::ClientContext> context,
122-
google::test::admin::database::v1::GetDatabaseRequest const& request) override;
120+
google::cloud::CompletionQueue& cq,
121+
std::unique_ptr<grpc::ClientContext> context,
122+
google::test::admin::database::v1::GetDatabaseRequest const& request) override;
123123

124124
future<Status> AsyncDropDatabase(
125-
google::cloud::CompletionQueue& cq,
126-
std::unique_ptr<grpc::ClientContext> context,
127-
google::test::admin::database::v1::DropDatabaseRequest const& request) override;
125+
google::cloud::CompletionQueue& cq,
126+
std::unique_ptr<grpc::ClientContext> context,
127+
google::test::admin::database::v1::DropDatabaseRequest const& request) override;
128128

129129
future<StatusOr<google::longrunning::Operation>> AsyncGetOperation(
130-
google::cloud::CompletionQueue& cq,
131-
std::unique_ptr<grpc::ClientContext> context,
132-
google::longrunning::GetOperationRequest const& request) override;
130+
google::cloud::CompletionQueue& cq,
131+
std::unique_ptr<grpc::ClientContext> context,
132+
google::longrunning::GetOperationRequest const& request) override;
133133

134134
future<Status> AsyncCancelOperation(
135-
google::cloud::CompletionQueue& cq,
136-
std::unique_ptr<grpc::ClientContext> context,
137-
google::longrunning::CancelOperationRequest const& request) override;
135+
google::cloud::CompletionQueue& cq,
136+
std::unique_ptr<grpc::ClientContext> context,
137+
google::longrunning::CancelOperationRequest const& request) override;
138138

139139
private:
140140
std::shared_ptr<GoldenThingAdminStub> child_;

0 commit comments

Comments
 (0)