Skip to content

Commit 9c813e1

Browse files
devbwwdevbww
authored
impl(generator): stop generating internal MakeServiceConnection() helper (#9574)
1 parent eba6d7f commit 9c813e1

386 files changed

Lines changed: 42 additions & 6253 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎generator/integration_tests/golden/golden_kitchen_sink_connection.cc‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
120120
} // namespace golden
121121
} // namespace cloud
122122
} // namespace google
123-
124-
namespace google {
125-
namespace cloud {
126-
namespace golden_internal {
127-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
128-
129-
std::shared_ptr<golden::GoldenKitchenSinkConnection>
130-
MakeGoldenKitchenSinkConnection(
131-
std::shared_ptr<GoldenKitchenSinkStub> stub, Options options) {
132-
options = GoldenKitchenSinkDefaultOptions(std::move(options));
133-
auto background = internal::MakeBackgroundThreadsFactory(options)();
134-
return std::make_shared<golden_internal::GoldenKitchenSinkConnectionImpl>(
135-
std::move(background), std::move(stub), std::move(options));
136-
}
137-
138-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
139-
} // namespace golden_internal
140-
} // namespace cloud
141-
} // namespace google

‎generator/integration_tests/golden/golden_kitchen_sink_connection.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
127127
} // namespace cloud
128128
} // namespace google
129129

130-
namespace google {
131-
namespace cloud {
132-
namespace golden_internal {
133-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
134-
135-
std::shared_ptr<golden::GoldenKitchenSinkConnection>
136-
MakeGoldenKitchenSinkConnection(
137-
std::shared_ptr<GoldenKitchenSinkStub> stub,
138-
Options options);
139-
140-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
141-
} // namespace golden_internal
142-
} // namespace cloud
143-
} // namespace google
144-
145130
#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H

‎generator/integration_tests/golden/golden_thing_admin_connection.cc‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -184,22 +184,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
184184
} // namespace golden
185185
} // namespace cloud
186186
} // namespace google
187-
188-
namespace google {
189-
namespace cloud {
190-
namespace golden_internal {
191-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
192-
193-
std::shared_ptr<golden::GoldenThingAdminConnection>
194-
MakeGoldenThingAdminConnection(
195-
std::shared_ptr<GoldenThingAdminStub> stub, Options options) {
196-
options = GoldenThingAdminDefaultOptions(std::move(options));
197-
auto background = internal::MakeBackgroundThreadsFactory(options)();
198-
return std::make_shared<golden_internal::GoldenThingAdminConnectionImpl>(
199-
std::move(background), std::move(stub), std::move(options));
200-
}
201-
202-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
203-
} // namespace golden_internal
204-
} // namespace cloud
205-
} // namespace google

‎generator/integration_tests/golden/golden_thing_admin_connection.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
156156
} // namespace cloud
157157
} // namespace google
158158

159-
namespace google {
160-
namespace cloud {
161-
namespace golden_internal {
162-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
163-
164-
std::shared_ptr<golden::GoldenThingAdminConnection>
165-
MakeGoldenThingAdminConnection(
166-
std::shared_ptr<GoldenThingAdminStub> stub,
167-
Options options);
168-
169-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
170-
} // namespace golden_internal
171-
} // namespace cloud
172-
} // namespace google
173-
174159
#endif // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H

‎generator/integration_tests/golden/tests/golden_kitchen_sink_connection_test.cc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313
// limitations under the License.
1414

1515
#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
16+
#include "google/cloud/grpc_options.h"
1617
#include "google/cloud/polling_policy.h"
1718
#include "google/cloud/testing_util/scoped_log.h"
1819
#include "google/cloud/testing_util/status_matchers.h"
1920
#include "generator/integration_tests/golden/golden_kitchen_sink_options.h"
21+
#include "generator/integration_tests/golden/internal/golden_kitchen_sink_connection_impl.h"
22+
#include "generator/integration_tests/golden/internal/golden_kitchen_sink_option_defaults.h"
2023
#include "generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_stub.h"
2124
#include <gmock/gmock.h>
2225
#include <memory>
@@ -27,6 +30,9 @@ namespace golden {
2730
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
2831
namespace {
2932

33+
using ::google::cloud::golden_internal::GoldenKitchenSinkConnectionImpl;
34+
using ::google::cloud::golden_internal::GoldenKitchenSinkDefaultOptions;
35+
using ::google::cloud::golden_internal::GoldenKitchenSinkStub;
3036
using ::google::cloud::golden_internal::MockGoldenKitchenSinkStub;
3137
using ::google::cloud::golden_internal::MockTailLogEntriesStreamingReadRpc;
3238
using ::google::cloud::testing_util::StatusIs;
@@ -38,7 +44,7 @@ using ::testing::ElementsAre;
3844
using ::testing::Return;
3945

4046
std::shared_ptr<golden::GoldenKitchenSinkConnection> CreateTestingConnection(
41-
std::shared_ptr<golden_internal::GoldenKitchenSinkStub> mock) {
47+
std::shared_ptr<GoldenKitchenSinkStub> mock) {
4248
golden::GoldenKitchenSinkLimitedErrorCountRetryPolicy retry(
4349
/*maximum_failures=*/2);
4450
ExponentialBackoffPolicy backoff(
@@ -48,11 +54,13 @@ std::shared_ptr<golden::GoldenKitchenSinkConnection> CreateTestingConnection(
4854
GenericPollingPolicy<golden::GoldenKitchenSinkLimitedErrorCountRetryPolicy,
4955
ExponentialBackoffPolicy>
5056
polling(retry, backoff);
51-
Options options;
52-
options.set<golden::GoldenKitchenSinkRetryPolicyOption>(retry.clone());
53-
options.set<golden::GoldenKitchenSinkBackoffPolicyOption>(backoff.clone());
54-
return golden_internal::MakeGoldenKitchenSinkConnection(std::move(mock),
55-
std::move(options));
57+
auto options = GoldenKitchenSinkDefaultOptions(
58+
Options{}
59+
.set<golden::GoldenKitchenSinkRetryPolicyOption>(retry.clone())
60+
.set<golden::GoldenKitchenSinkBackoffPolicyOption>(backoff.clone()));
61+
auto background = internal::MakeBackgroundThreadsFactory(options)();
62+
return std::make_shared<golden_internal::GoldenKitchenSinkConnectionImpl>(
63+
std::move(background), std::move(mock), std::move(options));
5664
}
5765

5866
TEST(GoldenKitchenSinkConnectionTest, GenerateAccessTokenSuccess) {

‎generator/integration_tests/golden/tests/golden_thing_admin_connection_test.cc‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
// limitations under the License.
1414

1515
#include "generator/integration_tests/golden/golden_thing_admin_connection.h"
16+
#include "google/cloud/grpc_options.h"
1617
#include "google/cloud/polling_policy.h"
1718
#include "google/cloud/testing_util/async_sequencer.h"
1819
#include "google/cloud/testing_util/is_proto_equal.h"
1920
#include "google/cloud/testing_util/scoped_log.h"
2021
#include "google/cloud/testing_util/status_matchers.h"
2122
#include "generator/integration_tests/golden/golden_thing_admin_options.h"
23+
#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h"
24+
#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h"
2225
#include "generator/integration_tests/golden/mocks/mock_golden_thing_admin_stub.h"
2326
#include <google/protobuf/text_format.h>
2427
#include <gmock/gmock.h>
@@ -30,6 +33,9 @@ namespace golden {
3033
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
3134
namespace {
3235

36+
using ::google::cloud::golden_internal::GoldenThingAdminConnectionImpl;
37+
using ::google::cloud::golden_internal::GoldenThingAdminDefaultOptions;
38+
using ::google::cloud::golden_internal::GoldenThingAdminStub;
3339
using ::google::cloud::golden_internal::MockGoldenThingAdminStub;
3440
using ::google::cloud::testing_util::AsyncSequencer;
3541
using ::google::cloud::testing_util::IsProtoEqual;
@@ -43,7 +49,7 @@ using ::testing::HasSubstr;
4349
using ::testing::Return;
4450

4551
std::shared_ptr<golden::GoldenThingAdminConnection> CreateTestingConnection(
46-
std::shared_ptr<golden_internal::GoldenThingAdminStub> mock) {
52+
std::shared_ptr<GoldenThingAdminStub> mock) {
4753
golden::GoldenThingAdminLimitedErrorCountRetryPolicy retry(
4854
/*maximum_failures=*/2);
4955
ExponentialBackoffPolicy backoff(
@@ -53,12 +59,14 @@ std::shared_ptr<golden::GoldenThingAdminConnection> CreateTestingConnection(
5359
GenericPollingPolicy<golden::GoldenThingAdminLimitedErrorCountRetryPolicy,
5460
ExponentialBackoffPolicy>
5561
polling(retry, backoff);
56-
Options options;
57-
options.set<golden::GoldenThingAdminRetryPolicyOption>(retry.clone());
58-
options.set<golden::GoldenThingAdminBackoffPolicyOption>(backoff.clone());
59-
options.set<golden::GoldenThingAdminPollingPolicyOption>(polling.clone());
60-
return golden_internal::MakeGoldenThingAdminConnection(std::move(mock),
61-
std::move(options));
62+
auto options = GoldenThingAdminDefaultOptions(
63+
Options{}
64+
.set<golden::GoldenThingAdminRetryPolicyOption>(retry.clone())
65+
.set<golden::GoldenThingAdminBackoffPolicyOption>(backoff.clone())
66+
.set<golden::GoldenThingAdminPollingPolicyOption>(polling.clone()));
67+
auto background = internal::MakeBackgroundThreadsFactory(options)();
68+
return std::make_shared<GoldenThingAdminConnectionImpl>(
69+
std::move(background), std::move(mock), std::move(options));
6270
}
6371

6472
google::longrunning::Operation CreateStartingOperation() {

‎generator/integration_tests/golden/tests/plumbing_test.cc‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include "google/cloud/grpc_options.h"
1516
#include "google/cloud/testing_util/mock_backoff_policy.h"
1617
#include "google/cloud/testing_util/status_matchers.h"
1718
#include "generator/integration_tests/golden/golden_thing_admin_client.h"
1819
#include "generator/integration_tests/golden/golden_thing_admin_options.h"
20+
#include "generator/integration_tests/golden/internal/golden_thing_admin_connection_impl.h"
21+
#include "generator/integration_tests/golden/internal/golden_thing_admin_option_defaults.h"
1922
#include "generator/integration_tests/golden/mocks/mock_golden_thing_admin_stub.h"
2023
#include <gmock/gmock.h>
2124
#include <memory>
@@ -67,7 +70,11 @@ TEST(PlumbingTest, RetryLoopUsesPerCallPolicies) {
6770
EXPECT_CALL(*stub, GetDatabase)
6871
.WillOnce(Return(Status(StatusCode::kUnavailable, "try again")))
6972
.WillOnce(Return(Status(StatusCode::kPermissionDenied, "fail")));
70-
auto conn = golden_internal::MakeGoldenThingAdminConnection(stub, {});
73+
74+
auto options = golden_internal::GoldenThingAdminDefaultOptions({});
75+
auto background = internal::MakeBackgroundThreadsFactory(options)();
76+
auto conn = std::make_shared<golden_internal::GoldenThingAdminConnectionImpl>(
77+
std::move(background), std::move(stub), std::move(options));
7178
auto client = GoldenThingAdminClient(std::move(conn));
7279

7380
(void)client.GetDatabase("name", std::move(call_options));
@@ -109,7 +116,11 @@ TEST(PlumbingTest, PollingLoopUsesPerCallPolicies) {
109116
op.set_done(true);
110117
return make_ready_future(make_status_or(op));
111118
});
112-
auto conn = golden_internal::MakeGoldenThingAdminConnection(stub, {});
119+
120+
auto options = golden_internal::GoldenThingAdminDefaultOptions({});
121+
auto background = internal::MakeBackgroundThreadsFactory(options)();
122+
auto conn = std::make_shared<golden_internal::GoldenThingAdminConnectionImpl>(
123+
std::move(background), std::move(stub), std::move(options));
113124
auto client = GoldenThingAdminClient(std::move(conn));
114125

115126
(void)client.CreateDatabase({}, std::move(call_options));

‎generator/internal/connection_generator.cc‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -231,17 +231,6 @@ std::shared_ptr<$connection_class_name$> Make$connection_class_name$(
231231

232232
HeaderCloseNamespaces();
233233

234-
HeaderOpenNamespaces(NamespaceType::kInternal);
235-
HeaderPrint(
236-
// clang-format off
237-
"\n"
238-
"std::shared_ptr<$product_namespace$::$connection_class_name$>\n"
239-
"Make$connection_class_name$(\n"
240-
" std::shared_ptr<$stub_class_name$> stub,\n"
241-
" Options options);\n");
242-
// clang-format on
243-
HeaderCloseNamespaces();
244-
245234
// close header guard
246235
HeaderPrint("\n#endif // $header_include_guard$\n");
247236
return {};
@@ -409,21 +398,6 @@ std::shared_ptr<$connection_class_name$> Make$connection_class_name$(
409398

410399
CcCloseNamespaces();
411400

412-
CcOpenNamespaces(NamespaceType::kInternal);
413-
414-
CcPrint(
415-
R"""(
416-
std::shared_ptr<$product_namespace$::$connection_class_name$>
417-
Make$connection_class_name$(
418-
std::shared_ptr<$stub_class_name$> stub, Options options) {
419-
options = $service_name$DefaultOptions(std::move(options));
420-
auto background = internal::MakeBackgroundThreadsFactory(options)();
421-
return std::make_shared<$product_internal_namespace$::$connection_class_name$Impl>(
422-
std::move(background), std::move(stub), std::move(options));
423-
}
424-
)""");
425-
426-
CcCloseNamespaces();
427401
return {};
428402
}
429403

‎google/cloud/accessapproval/access_approval_connection.cc‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
113113
} // namespace accessapproval
114114
} // namespace cloud
115115
} // namespace google
116-
117-
namespace google {
118-
namespace cloud {
119-
namespace accessapproval_internal {
120-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
121-
122-
std::shared_ptr<accessapproval::AccessApprovalConnection>
123-
MakeAccessApprovalConnection(std::shared_ptr<AccessApprovalStub> stub,
124-
Options options) {
125-
options = AccessApprovalDefaultOptions(std::move(options));
126-
auto background = internal::MakeBackgroundThreadsFactory(options)();
127-
return std::make_shared<
128-
accessapproval_internal::AccessApprovalConnectionImpl>(
129-
std::move(background), std::move(stub), std::move(options));
130-
}
131-
132-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
133-
} // namespace accessapproval_internal
134-
} // namespace cloud
135-
} // namespace google

‎google/cloud/accessapproval/access_approval_connection.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
139139
} // namespace cloud
140140
} // namespace google
141141

142-
namespace google {
143-
namespace cloud {
144-
namespace accessapproval_internal {
145-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
146-
147-
std::shared_ptr<accessapproval::AccessApprovalConnection>
148-
MakeAccessApprovalConnection(std::shared_ptr<AccessApprovalStub> stub,
149-
Options options);
150-
151-
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
152-
} // namespace accessapproval_internal
153-
} // namespace cloud
154-
} // namespace google
155-
156142
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_H

0 commit comments

Comments
 (0)