diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc index d756b262f5fa1..d55035d5fe0ad 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.cc @@ -433,7 +433,7 @@ DefaultGoldenThingAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -450,7 +450,7 @@ future DefaultGoldenThingAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, cq); }, request, std::move(context)) .then([](future> f) { diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h index 4b1e7adac8fad..3591f12bc6e0b 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub.h @@ -201,13 +201,11 @@ class DefaultGoldenThingAdminStub : public GoldenThingAdminStub { public: DefaultGoldenThingAdminStub( std::unique_ptr grpc_stub, - std::unique_ptr operations_stub, std::unique_ptr locations_stub, - std::unique_ptr operations) + std::unique_ptr operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDatabases( grpc::ClientContext& context, @@ -365,9 +363,8 @@ class DefaultGoldenThingAdminStub : public GoldenThingAdminStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc index b5473b9e80a82..00515d63f390e 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_stub_factory.cc @@ -46,11 +46,10 @@ CreateDefaultGoldenThingAdminStub( auto channel = auth->CreateChannel( options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::test::admin::database::v1::GoldenThingAdmin::NewStub(channel); - auto service_operations_stub = google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/generator/integration_tests/golden/v1/internal/request_id_stub.cc b/generator/integration_tests/golden/v1/internal/request_id_stub.cc index 13114571ca103..cd8b7b8346c43 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_stub.cc +++ b/generator/integration_tests/golden/v1/internal/request_id_stub.cc @@ -119,7 +119,7 @@ DefaultRequestIdServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -136,7 +136,7 @@ future DefaultRequestIdServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, cq); }, request, std::move(context)) .then([](future> f) { diff --git a/generator/integration_tests/golden/v1/internal/request_id_stub.h b/generator/integration_tests/golden/v1/internal/request_id_stub.h index 752b58dae516c..71abeb30b5374 100644 --- a/generator/integration_tests/golden/v1/internal/request_id_stub.h +++ b/generator/integration_tests/golden/v1/internal/request_id_stub.h @@ -83,9 +83,9 @@ class DefaultRequestIdServiceStub : public RequestIdServiceStub { public: DefaultRequestIdServiceStub( std::unique_ptr grpc_stub, - std::unique_ptr operations) + std::unique_ptr operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateFoo( grpc::ClientContext& context, @@ -128,7 +128,7 @@ class DefaultRequestIdServiceStub : public RequestIdServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/generator/integration_tests/tests/golden_thing_admin_stub_test.cc b/generator/integration_tests/tests/golden_thing_admin_stub_test.cc index ee1987d34416d..8db1e24162ab3 100644 --- a/generator/integration_tests/tests/golden_thing_admin_stub_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_stub_test.cc @@ -592,127 +592,11 @@ class MockLocationsStub (override)); }; -class MockOperationsStub - : public google::longrunning::Operations::StubInterface { - public: - ~MockOperationsStub() override = default; - MOCK_METHOD(::grpc::Status, ListOperations, - (::grpc::ClientContext * context, - ::google::longrunning::ListOperationsRequest const& request, - ::google::longrunning::ListOperationsResponse* response), - (override)); - - MOCK_METHOD(::grpc::Status, GetOperation, - (::grpc::ClientContext * context, - ::google::longrunning::GetOperationRequest const& request, - ::google::longrunning::Operation* response), - (override)); - - MOCK_METHOD(::grpc::Status, DeleteOperation, - (::grpc::ClientContext * context, - ::google::longrunning::DeleteOperationRequest const& request, - ::google::protobuf::Empty* response), - (override)); - - MOCK_METHOD(::grpc::Status, CancelOperation, - (::grpc::ClientContext * context, - ::google::longrunning::CancelOperationRequest const& request, - ::google::protobuf::Empty* response), - (override)); - - MOCK_METHOD(::grpc::Status, WaitOperation, - (::grpc::ClientContext * context, - ::google::longrunning::WaitOperationRequest const& request, - ::google::longrunning::Operation* response), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::ListOperationsResponse>*, - AsyncListOperationsRaw, - (::grpc::ClientContext * context, - ::google::longrunning::ListOperationsRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::ListOperationsResponse>*, - PrepareAsyncListOperationsRaw, - (::grpc::ClientContext * context, - ::google::longrunning::ListOperationsRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::Operation>*, - AsyncGetOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::GetOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::Operation>*, - PrepareAsyncGetOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::GetOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD( - ::grpc::ClientAsyncResponseReaderInterface<::google::protobuf::Empty>*, - AsyncDeleteOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::DeleteOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD( - ::grpc::ClientAsyncResponseReaderInterface<::google::protobuf::Empty>*, - PrepareAsyncDeleteOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::DeleteOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD( - ::grpc::ClientAsyncResponseReaderInterface<::google::protobuf::Empty>*, - AsyncCancelOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::CancelOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD( - ::grpc::ClientAsyncResponseReaderInterface<::google::protobuf::Empty>*, - PrepareAsyncCancelOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::CancelOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::Operation>*, - AsyncWaitOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::WaitOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); - - MOCK_METHOD(::grpc::ClientAsyncResponseReaderInterface< - ::google::longrunning::Operation>*, - PrepareAsyncWaitOperationRaw, - (::grpc::ClientContext * context, - ::google::longrunning::WaitOperationRequest const& request, - ::grpc::CompletionQueue* cq), - (override)); -}; - class GoldenStubTest : public ::testing::Test { protected: void SetUp() override { grpc_stub_ = std::make_unique(); longrunning_stub_ = std::make_unique(); - operations_stub_ = std::make_unique(); location_stub_ = std::make_unique(); } @@ -736,7 +620,6 @@ class GoldenStubTest : public ::testing::Test { std::unique_ptr grpc_stub_; std::unique_ptr longrunning_stub_; - std::unique_ptr operations_stub_; std::unique_ptr location_stub_; }; @@ -748,9 +631,9 @@ TEST_F(GoldenStubTest, GetLocation) { .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.GetLocation(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.GetLocation(context, Options{}, request); @@ -761,13 +644,13 @@ TEST_F(GoldenStubTest, ListOperations) { grpc::Status status; grpc::ClientContext context; google::longrunning::ListOperationsRequest request; - EXPECT_CALL(*operations_stub_, ListOperations(&context, _, _)) + EXPECT_CALL(*longrunning_stub_, ListOperations(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.ListOperations(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.ListOperations(context, Options{}, request); @@ -782,9 +665,9 @@ TEST_F(GoldenStubTest, ListDatabases) { .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.ListDatabases(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.ListDatabases(context, Options{}, request); @@ -805,9 +688,9 @@ TEST_F(GoldenStubTest, AsyncCreateDatabase) { EXPECT_CALL(*mock, cq).WillOnce(Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::CreateDatabaseRequest request; auto failure = stub.AsyncCreateDatabase(cq, std::make_shared(), @@ -822,9 +705,9 @@ TEST_F(GoldenStubTest, SynchronousCreateDatabase) { EXPECT_CALL(*grpc_stub_, CreateDatabase(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.CreateDatabase(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.CreateDatabase(context, Options{}, request); @@ -838,9 +721,9 @@ TEST_F(GoldenStubTest, GetDatabase) { EXPECT_CALL(*grpc_stub_, GetDatabase(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.GetDatabase(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.GetDatabase(context, Options{}, request); @@ -861,9 +744,9 @@ TEST_F(GoldenStubTest, AsyncUpdateDatabaseDdl) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::UpdateDatabaseDdlRequest request; auto failure = stub.AsyncUpdateDatabaseDdl(cq, std::make_shared(), @@ -878,9 +761,9 @@ TEST_F(GoldenStubTest, SynchronousUpdateDatabaseDdl) { EXPECT_CALL(*grpc_stub_, UpdateDatabaseDdl(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.UpdateDatabaseDdl(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.UpdateDatabaseDdl(context, Options{}, request); @@ -894,9 +777,9 @@ TEST_F(GoldenStubTest, DropDatabase) { EXPECT_CALL(*grpc_stub_, DropDatabase(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.DropDatabase(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.DropDatabase(context, Options{}, request); @@ -910,9 +793,9 @@ TEST_F(GoldenStubTest, GetDatabaseDdl) { EXPECT_CALL(*grpc_stub_, GetDatabaseDdl(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.GetDatabaseDdl(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.GetDatabaseDdl(context, Options{}, request); @@ -926,9 +809,9 @@ TEST_F(GoldenStubTest, SetIamPolicy) { EXPECT_CALL(*grpc_stub_, SetIamPolicy(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.SetIamPolicy(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.SetIamPolicy(context, Options{}, request); @@ -942,9 +825,9 @@ TEST_F(GoldenStubTest, GetIamPolicy) { EXPECT_CALL(*grpc_stub_, GetIamPolicy(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.GetIamPolicy(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.GetIamPolicy(context, Options{}, request); @@ -958,9 +841,9 @@ TEST_F(GoldenStubTest, TestIamPermissions) { EXPECT_CALL(*grpc_stub_, TestIamPermissions(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.TestIamPermissions(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.TestIamPermissions(context, Options{}, request); @@ -980,9 +863,9 @@ TEST_F(GoldenStubTest, AsyncCreateBackup) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::CreateBackupRequest request; auto failure = stub.AsyncCreateBackup(cq, std::make_shared(), @@ -997,9 +880,9 @@ TEST_F(GoldenStubTest, SynchronousCreateBackup) { EXPECT_CALL(*grpc_stub_, CreateBackup(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.CreateBackup(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.CreateBackup(context, Options{}, request); @@ -1013,9 +896,9 @@ TEST_F(GoldenStubTest, GetBackup) { EXPECT_CALL(*grpc_stub_, GetBackup(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.GetBackup(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.GetBackup(context, Options{}, request); @@ -1029,9 +912,9 @@ TEST_F(GoldenStubTest, UpdateBackup) { EXPECT_CALL(*grpc_stub_, UpdateBackup(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.UpdateBackup(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.UpdateBackup(context, Options{}, request); @@ -1045,9 +928,9 @@ TEST_F(GoldenStubTest, DeleteBackup) { EXPECT_CALL(*grpc_stub_, DeleteBackup(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.DeleteBackup(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.DeleteBackup(context, Options{}, request); @@ -1061,9 +944,9 @@ TEST_F(GoldenStubTest, ListBackups) { EXPECT_CALL(*grpc_stub_, ListBackups(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.ListBackups(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.ListBackups(context, Options{}, request); @@ -1084,9 +967,9 @@ TEST_F(GoldenStubTest, AsyncRestoreDatabase) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::RestoreDatabaseRequest request; auto failure = stub.AsyncRestoreDatabase(cq, std::make_shared(), @@ -1101,9 +984,9 @@ TEST_F(GoldenStubTest, SynchronousRestoreDatabase) { EXPECT_CALL(*grpc_stub_, RestoreDatabase(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.RestoreDatabase(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.RestoreDatabase(context, Options{}, request); @@ -1117,9 +1000,9 @@ TEST_F(GoldenStubTest, ListDatabaseOperations) { EXPECT_CALL(*grpc_stub_, ListDatabaseOperations(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.ListDatabaseOperations(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.ListDatabaseOperations(context, Options{}, request); @@ -1133,9 +1016,9 @@ TEST_F(GoldenStubTest, ListBackupOperations) { EXPECT_CALL(*grpc_stub_, ListBackupOperations(&context, _, _)) .WillOnce(Return(status)) .WillOnce(Return(GrpcTransientError())); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); auto success = stub.ListBackupOperations(context, Options{}, request); EXPECT_THAT(success, IsOk()); auto failure = stub.ListBackupOperations(context, Options{}, request); @@ -1156,9 +1039,9 @@ TEST_F(GoldenStubTest, AsyncGetDatabase) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::GetDatabaseRequest request; auto failure = stub.AsyncGetDatabase( cq, std::make_shared(), @@ -1179,9 +1062,9 @@ TEST_F(GoldenStubTest, AsyncDropDatabase) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::test::admin::database::v1::DropDatabaseRequest request; auto failure = stub.AsyncDropDatabase( cq, std::make_shared(), @@ -1203,9 +1086,9 @@ TEST_F(GoldenStubTest, AsyncGetOperation) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::longrunning::GetOperationRequest request; auto failure = stub.AsyncGetOperation(cq, std::make_shared(), @@ -1227,9 +1110,9 @@ TEST_F(GoldenStubTest, AsyncCancelOperation) { EXPECT_CALL(*mock, cq).WillOnce(::testing::Return(nullptr)); CompletionQueue cq(mock); - DefaultGoldenThingAdminStub stub( - std::move(grpc_stub_), std::move(operations_stub_), - std::move(location_stub_), std::move(longrunning_stub_)); + DefaultGoldenThingAdminStub stub(std::move(grpc_stub_), + std::move(location_stub_), + std::move(longrunning_stub_)); google::longrunning::CancelOperationRequest request; auto failure = stub.AsyncCancelOperation(cq, std::make_shared(), diff --git a/generator/internal/stub_factory_generator.cc b/generator/internal/stub_factory_generator.cc index 442b5bcc25e64..56e3b83c472e7 100644 --- a/generator/internal/stub_factory_generator.cc +++ b/generator/internal/stub_factory_generator.cc @@ -99,6 +99,12 @@ Status StubFactoryGenerator::GenerateCc() { std::unordered_map mixin_grpc_stubs; for (auto const& mixin_method : MixinMethods()) { + // We create operations stub for service with LRO no matter it has LRO mixin + // or not, so we skip creating mixin operations stub for the services with + // LRO. + if (HasLongrunningMethod() && + mixin_method.grpc_stub_name == "operations_stub") + continue; mixin_grpc_stubs[mixin_method.grpc_stub_name] = mixin_method.grpc_stub_fqn; } std::string mixin_stub_inits; diff --git a/generator/internal/stub_generator.cc b/generator/internal/stub_generator.cc index 06292aeda7366..a3a9b6d95ca88 100644 --- a/generator/internal/stub_generator.cc +++ b/generator/internal/stub_generator.cc @@ -223,6 +223,8 @@ Status StubGenerator::GenerateHeader() { " public:"); std::unordered_map mixin_grpc_stubs; for (auto const& mixin_method : MixinMethods()) { + // We create operations stub for service with LRO no matter it has LRO mixin or not, so we skip creating mixin operations stub for the services with LRO. + if (HasLongrunningMethod() && mixin_method.grpc_stub_name == "operations_stub") continue; mixin_grpc_stubs[mixin_method.grpc_stub_name] = mixin_method.grpc_stub_fqn; } @@ -236,7 +238,7 @@ Status StubGenerator::GenerateHeader() { R"""( std::unique_ptr<%s::StubInterface> %s, )""", mixin_grpc_stub.second, mixin_grpc_stub.first)); } - HeaderPrint(R"""( std::unique_ptr operations) + HeaderPrint(R"""( std::unique_ptr operations_stub) : grpc_stub_(std::move(grpc_stub)), )"""); for (auto const& mixin_grpc_stub : mixin_grpc_stubs) { @@ -244,7 +246,7 @@ Status StubGenerator::GenerateHeader() { R"""( %s_(std::move(%s)), )""", mixin_grpc_stub.first, mixin_grpc_stub.first)); } - HeaderPrint(R"""( operations_(std::move(operations)) {} + HeaderPrint(R"""( operations_stub_(std::move(operations_stub)) {} )"""); } else { @@ -282,7 +284,7 @@ Status StubGenerator::GenerateHeader() { if (HasLongrunningMethod()) { // TODO(#14746) - clean up operation stubs HeaderPrint( // clang-format off - " std::unique_ptr operations_;\n"); + " std::unique_ptr operations_stub_;\n"); // clang-format on } HeaderPrint("};\n"); @@ -565,7 +567,7 @@ Default$stub_class_name$::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -582,7 +584,7 @@ future Default$stub_class_name$::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc index a7ca6fdf94952..de9ae931f53ea 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.cc @@ -705,7 +705,7 @@ DefaultAccessContextManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -722,7 +722,8 @@ future DefaultAccessContextManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h index 937e6e4a8274d..8201a17b445d6 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub.h @@ -314,12 +314,9 @@ class DefaultAccessContextManagerStub : public AccessContextManagerStub { AccessContextManager::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::identity::accesscontextmanager::v1::ListAccessPoliciesResponse> @@ -588,7 +585,6 @@ class DefaultAccessContextManagerStub : public AccessContextManagerStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc index 3857c3c272ce2..a9804819762d4 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_stub_factory.cc @@ -46,11 +46,9 @@ std::shared_ptr CreateDefaultAccessContextManagerStub( auto service_grpc_stub = google::identity::accesscontextmanager::v1::AccessContextManager::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub.cc b/google/cloud/aiplatform/v1/internal/dataset_stub.cc index 6cddb0097f9d3..4f6a50568bc0a 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_stub.cc @@ -537,7 +537,7 @@ DefaultDatasetServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -554,7 +554,8 @@ future DefaultDatasetServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub.h b/google/cloud/aiplatform/v1/internal/dataset_stub.h index fbb545bfb0e52..3c3dffaa040d1 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub.h +++ b/google/cloud/aiplatform/v1/internal/dataset_stub.h @@ -250,18 +250,15 @@ class DefaultDatasetServiceStub : public DatasetServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::DatasetService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDataset( google::cloud::CompletionQueue& cq, @@ -465,12 +462,11 @@ class DefaultDatasetServiceStub : public DatasetServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc b/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc index 290e750df20c6..422c77c91999f 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDatasetServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::DatasetService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc index 60238d084c5f5..f29ccf725822b 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.cc @@ -297,7 +297,7 @@ DefaultDeploymentResourcePoolServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -314,7 +314,8 @@ future DefaultDeploymentResourcePoolServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h index 823a8af8dc2f3..3097782e6834a 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub.h @@ -154,18 +154,15 @@ class DefaultDeploymentResourcePoolServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDeploymentResourcePool( @@ -274,12 +271,11 @@ class DefaultDeploymentResourcePoolServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc index 2074b876c73f9..9f607c7304c3c 100644 --- a/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/deployment_resource_pool_stub_factory.cc @@ -49,15 +49,13 @@ CreateDefaultDeploymentResourcePoolServiceStub( auto service_grpc_stub = google::cloud::aiplatform::v1::DeploymentResourcePoolService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub.cc b/google/cloud/aiplatform/v1/internal/endpoint_stub.cc index a29761d02b87c..eaba9dc7c7429 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub.cc @@ -350,7 +350,7 @@ DefaultEndpointServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -367,7 +367,8 @@ future DefaultEndpointServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub.h b/google/cloud/aiplatform/v1/internal/endpoint_stub.h index b82522cf6ef29..bb6dc6f494f3b 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub.h +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub.h @@ -167,18 +167,15 @@ class DefaultEndpointServiceStub : public EndpointServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::EndpointService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateEndpoint( google::cloud::CompletionQueue& cq, @@ -310,12 +307,11 @@ class DefaultEndpointServiceStub : public EndpointServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc b/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc index 784ac6391a6fb..bf05ffca0ba7d 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultEndpointServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::EndpointService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc index 1f841f6abce12..9fe66cf582223 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.cc @@ -449,7 +449,7 @@ DefaultFeatureOnlineStoreAdminServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -466,7 +466,8 @@ future DefaultFeatureOnlineStoreAdminServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h index b86e555944bcd..87647af1ec515 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub.h @@ -219,18 +219,15 @@ class DefaultFeatureOnlineStoreAdminServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateFeatureOnlineStore( @@ -401,12 +398,11 @@ class DefaultFeatureOnlineStoreAdminServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc index cf7273aa76ee4..c5c2b1bda290a 100644 --- a/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/feature_online_store_admin_stub_factory.cc @@ -49,15 +49,13 @@ CreateDefaultFeatureOnlineStoreAdminServiceStub( auto service_grpc_stub = google::cloud::aiplatform::v1::FeatureOnlineStoreAdminService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc b/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc index 6d30f8af1b1f5..4fca2065ebacc 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub.cc @@ -394,7 +394,7 @@ DefaultFeatureRegistryServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -411,7 +411,8 @@ future DefaultFeatureRegistryServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub.h b/google/cloud/aiplatform/v1/internal/feature_registry_stub.h index 89a083a4c713c..ce464f1679824 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub.h +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub.h @@ -189,18 +189,15 @@ class DefaultFeatureRegistryServiceStub : public FeatureRegistryServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::FeatureRegistryService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateFeatureGroup( google::cloud::CompletionQueue& cq, @@ -350,12 +347,11 @@ class DefaultFeatureRegistryServiceStub : public FeatureRegistryServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::FeatureRegistryService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc b/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc index 59c2b3e145b96..e22411b9d6fce 100644 --- a/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/feature_registry_stub_factory.cc @@ -48,15 +48,13 @@ CreateDefaultFeatureRegistryServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::FeatureRegistryService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_stub.cc index b350776136a97..e55a7247f15e4 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub.cc @@ -642,7 +642,7 @@ DefaultFeaturestoreServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -659,7 +659,8 @@ future DefaultFeaturestoreServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub.h b/google/cloud/aiplatform/v1/internal/featurestore_stub.h index 59af87bd693fb..2edf9eed58974 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub.h +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub.h @@ -293,18 +293,15 @@ class DefaultFeaturestoreServiceStub : public FeaturestoreServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::FeaturestoreService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateFeaturestore( google::cloud::CompletionQueue& cq, @@ -551,12 +548,11 @@ class DefaultFeaturestoreServiceStub : public FeaturestoreServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::FeaturestoreService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc b/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc index a883f3b036aa7..fefe00b3dbceb 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultFeaturestoreServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::FeaturestoreService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc index 7be99164d1e06..61728e12152e0 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.cc @@ -239,7 +239,7 @@ DefaultGenAiTuningServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -256,7 +256,8 @@ future DefaultGenAiTuningServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h index 72f0d23e92396..90995f0dfc97a 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub.h @@ -131,18 +131,15 @@ class DefaultGenAiTuningServiceStub : public GenAiTuningServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::GenAiTuningService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateTuningJob( grpc::ClientContext& context, Options const& options, @@ -232,12 +229,11 @@ class DefaultGenAiTuningServiceStub : public GenAiTuningServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::GenAiTuningService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc index c21f2e237bbe8..67b1854720a07 100644 --- a/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/gen_ai_tuning_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultGenAiTuningServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::GenAiTuningService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc index 53cd64e976da5..8e88bb310273e 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.cc @@ -350,7 +350,7 @@ DefaultIndexEndpointServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -367,7 +367,8 @@ future DefaultIndexEndpointServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h index 6883a653cc176..925d944cf9158 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub.h @@ -177,18 +177,15 @@ class DefaultIndexEndpointServiceStub : public IndexEndpointServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::IndexEndpointService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateIndexEndpoint( google::cloud::CompletionQueue& cq, @@ -322,12 +319,11 @@ class DefaultIndexEndpointServiceStub : public IndexEndpointServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::IndexEndpointService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc index 9c1f17ed64bed..85076d33ee753 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultIndexEndpointServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::IndexEndpointService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/index_stub.cc b/google/cloud/aiplatform/v1/internal/index_stub.cc index 1ab41e1a6c499..b09586e01527f 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_stub.cc @@ -294,7 +294,7 @@ DefaultIndexServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -311,7 +311,8 @@ future DefaultIndexServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/index_stub.h b/google/cloud/aiplatform/v1/internal/index_stub.h index a62ca3864d3a5..00685327e71be 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub.h +++ b/google/cloud/aiplatform/v1/internal/index_stub.h @@ -150,18 +150,15 @@ class DefaultIndexServiceStub : public IndexServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::IndexService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateIndex( google::cloud::CompletionQueue& cq, @@ -273,12 +270,11 @@ class DefaultIndexServiceStub : public IndexServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/index_stub_factory.cc b/google/cloud/aiplatform/v1/internal/index_stub_factory.cc index 498df850dc0be..942271ee114ba 100644 --- a/google/cloud/aiplatform/v1/internal/index_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/index_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultIndexServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::IndexService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/job_stub.cc b/google/cloud/aiplatform/v1/internal/job_stub.cc index ddc4f51c626af..6df2a36a6e0d8 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub.cc +++ b/google/cloud/aiplatform/v1/internal/job_stub.cc @@ -752,7 +752,7 @@ DefaultJobServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -769,7 +769,8 @@ future DefaultJobServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/job_stub.h b/google/cloud/aiplatform/v1/internal/job_stub.h index 4c2521e05c2d6..7c40ff6eafef5 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub.h +++ b/google/cloud/aiplatform/v1/internal/job_stub.h @@ -342,18 +342,15 @@ class DefaultJobServiceStub : public JobServiceStub { DefaultJobServiceStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateCustomJob( grpc::ClientContext& context, Options const& options, @@ -652,12 +649,11 @@ class DefaultJobServiceStub : public JobServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/job_stub_factory.cc b/google/cloud/aiplatform/v1/internal/job_stub_factory.cc index bdf4a368406f0..701d198f483f0 100644 --- a/google/cloud/aiplatform/v1/internal/job_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/job_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultJobServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::JobService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub.cc b/google/cloud/aiplatform/v1/internal/metadata_stub.cc index b88b94bc82a23..e58c05ad4ff57 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_stub.cc @@ -706,7 +706,7 @@ DefaultMetadataServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -723,7 +723,8 @@ future DefaultMetadataServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub.h b/google/cloud/aiplatform/v1/internal/metadata_stub.h index 615d4b92bf282..d529b6e7f23fb 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub.h +++ b/google/cloud/aiplatform/v1/internal/metadata_stub.h @@ -310,18 +310,15 @@ class DefaultMetadataServiceStub : public MetadataServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::MetadataService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateMetadataStore( google::cloud::CompletionQueue& cq, @@ -603,12 +600,11 @@ class DefaultMetadataServiceStub : public MetadataServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc b/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc index f5268a4715529..a65abdf6bed7c 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultMetadataServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::MetadataService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/migration_stub.cc b/google/cloud/aiplatform/v1/internal/migration_stub.cc index 0cd48600786b7..c0ec77ab7f8ec 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub.cc +++ b/google/cloud/aiplatform/v1/internal/migration_stub.cc @@ -208,7 +208,7 @@ DefaultMigrationServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -225,7 +225,8 @@ future DefaultMigrationServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/migration_stub.h b/google/cloud/aiplatform/v1/internal/migration_stub.h index d037aee11a56a..828fb58c7b8c2 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub.h +++ b/google/cloud/aiplatform/v1/internal/migration_stub.h @@ -121,18 +121,15 @@ class DefaultMigrationServiceStub : public MigrationServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::MigrationService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr SearchMigratableResources( @@ -208,12 +205,11 @@ class DefaultMigrationServiceStub : public MigrationServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::MigrationService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc b/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc index 7df47c24c243d..ff538294f5e42 100644 --- a/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/migration_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultMigrationServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::MigrationService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/model_stub.cc b/google/cloud/aiplatform/v1/internal/model_stub.cc index 3ee906bb552c1..a08a8e2092013 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_stub.cc @@ -497,7 +497,7 @@ DefaultModelServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -514,7 +514,8 @@ future DefaultModelServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/model_stub.h b/google/cloud/aiplatform/v1/internal/model_stub.h index 1e0ba8c5062ea..be89b2b426303 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub.h +++ b/google/cloud/aiplatform/v1/internal/model_stub.h @@ -236,18 +236,15 @@ class DefaultModelServiceStub : public ModelServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::ModelService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncUploadModel( google::cloud::CompletionQueue& cq, @@ -442,12 +439,11 @@ class DefaultModelServiceStub : public ModelServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/model_stub_factory.cc b/google/cloud/aiplatform/v1/internal/model_stub_factory.cc index e047340579724..509f837315b14 100644 --- a/google/cloud/aiplatform/v1/internal/model_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/model_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultModelServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::ModelService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub.cc b/google/cloud/aiplatform/v1/internal/notebook_stub.cc index a54710f007d92..b4debca94a5c8 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_stub.cc @@ -557,7 +557,7 @@ DefaultNotebookServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -574,7 +574,8 @@ future DefaultNotebookServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub.h b/google/cloud/aiplatform/v1/internal/notebook_stub.h index 04d834efe4361..c88c1803084e0 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub.h +++ b/google/cloud/aiplatform/v1/internal/notebook_stub.h @@ -264,18 +264,15 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::NotebookService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateNotebookRuntimeTemplate( @@ -485,12 +482,11 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc b/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc index 86e1072206436..2abb664bff2fa 100644 --- a/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/notebook_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultNotebookServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::NotebookService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc index b1aa52f48f193..a53d617de7fd0 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.cc @@ -330,7 +330,7 @@ DefaultPersistentResourceServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -347,7 +347,8 @@ future DefaultPersistentResourceServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h index 6255f7484b74a..4135276d851d5 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub.h @@ -167,18 +167,15 @@ class DefaultPersistentResourceServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreatePersistentResource( @@ -300,12 +297,11 @@ class DefaultPersistentResourceServiceStub std::unique_ptr< google::cloud::aiplatform::v1::PersistentResourceService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc b/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc index 566c48c9dd466..f285d96824b02 100644 --- a/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/persistent_resource_stub_factory.cc @@ -49,15 +49,13 @@ CreateDefaultPersistentResourceServiceStub( auto service_grpc_stub = google::cloud::aiplatform::v1::PersistentResourceService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub.cc b/google/cloud/aiplatform/v1/internal/pipeline_stub.cc index 9fab9c8e8e592..3fe72031e865e 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub.cc @@ -395,7 +395,7 @@ DefaultPipelineServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -412,7 +412,8 @@ future DefaultPipelineServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub.h b/google/cloud/aiplatform/v1/internal/pipeline_stub.h index f6ad9b97da134..856177ab4f873 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub.h +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub.h @@ -196,18 +196,15 @@ class DefaultPipelineServiceStub : public PipelineServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::PipelineService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateTrainingPipeline( @@ -354,12 +351,11 @@ class DefaultPipelineServiceStub : public PipelineServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc b/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc index fe230354bccf5..d53fb3e99dff7 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultPipelineServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::PipelineService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub.cc b/google/cloud/aiplatform/v1/internal/schedule_stub.cc index abcddd641eeed..f3711d706c48a 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_stub.cc @@ -262,7 +262,7 @@ DefaultScheduleServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -279,7 +279,8 @@ future DefaultScheduleServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub.h b/google/cloud/aiplatform/v1/internal/schedule_stub.h index 256f92408a473..5e3cc59354173 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub.h +++ b/google/cloud/aiplatform/v1/internal/schedule_stub.h @@ -136,18 +136,15 @@ class DefaultScheduleServiceStub : public ScheduleServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::ScheduleService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateSchedule( grpc::ClientContext& context, Options const& options, @@ -246,12 +243,11 @@ class DefaultScheduleServiceStub : public ScheduleServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc b/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc index bcf6025039366..8a6c4c899830f 100644 --- a/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/schedule_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultScheduleServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::ScheduleService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc index 95727327a2b10..841c9c013ef67 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.cc @@ -280,7 +280,7 @@ DefaultSpecialistPoolServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -297,7 +297,8 @@ future DefaultSpecialistPoolServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h index afd14dbe05b8b..43a77d0569957 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub.h @@ -152,18 +152,15 @@ class DefaultSpecialistPoolServiceStub : public SpecialistPoolServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::SpecialistPoolService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateSpecialistPool( google::cloud::CompletionQueue& cq, @@ -268,12 +265,11 @@ class DefaultSpecialistPoolServiceStub : public SpecialistPoolServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::SpecialistPoolService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc index 8f8af11853d9c..24c792ff1a719 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_stub_factory.cc @@ -48,15 +48,13 @@ CreateDefaultSpecialistPoolServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::SpecialistPoolService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc b/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc index e824abde28c39..7d225b0cce8d8 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub.cc @@ -679,7 +679,7 @@ DefaultTensorboardServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -696,7 +696,8 @@ future DefaultTensorboardServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub.h b/google/cloud/aiplatform/v1/internal/tensorboard_stub.h index d8b7f423997c3..d89eb5e236944 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub.h +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub.h @@ -331,18 +331,15 @@ class DefaultTensorboardServiceStub : public TensorboardServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::TensorboardService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateTensorboard( google::cloud::CompletionQueue& cq, @@ -618,12 +615,11 @@ class DefaultTensorboardServiceStub : public TensorboardServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::TensorboardService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc b/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc index 3068552e997f5..af4e993d9299c 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultTensorboardServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::TensorboardService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub.cc b/google/cloud/aiplatform/v1/internal/vizier_stub.cc index 40a980907c2a7..ca92970cbf97d 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_stub.cc @@ -379,7 +379,7 @@ DefaultVizierServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -396,7 +396,8 @@ future DefaultVizierServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub.h b/google/cloud/aiplatform/v1/internal/vizier_stub.h index a317c046ed56f..8bdad179953a9 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub.h +++ b/google/cloud/aiplatform/v1/internal/vizier_stub.h @@ -181,18 +181,15 @@ class DefaultVizierServiceStub : public VizierServiceStub { std::unique_ptr< google::cloud::aiplatform::v1::VizierService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateStudy( grpc::ClientContext& context, Options const& options, @@ -334,12 +331,11 @@ class DefaultVizierServiceStub : public VizierServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc b/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc index 0dc2c34c22d6d..a62f4e0206bd3 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultVizierServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::aiplatform::v1::VizierService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc index 68b9c2cdbe3a1..9401788236be5 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.cc @@ -843,7 +843,7 @@ DefaultAlloyDBAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -860,7 +860,8 @@ future DefaultAlloyDBAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h index 252b79b77e52e..7ed045bbe5bea 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub.h @@ -347,16 +347,13 @@ class DefaultAlloyDBAdminStub : public AlloyDBAdminStub { DefaultAlloyDBAdminStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListClusters( grpc::ClientContext& context, Options const& options, @@ -668,11 +665,10 @@ class DefaultAlloyDBAdminStub : public AlloyDBAdminStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc index e554a9afda258..f82f732e137e3 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultAlloyDBAdminStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::alloydb::v1::AlloyDBAdmin::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/apigateway/v1/internal/api_gateway_stub.cc b/google/cloud/apigateway/v1/internal/api_gateway_stub.cc index dfa2fd10a2f33..09d5f97b2b025 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_stub.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_stub.cc @@ -389,7 +389,7 @@ DefaultApiGatewayServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -406,7 +406,8 @@ future DefaultApiGatewayServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/apigateway/v1/internal/api_gateway_stub.h b/google/cloud/apigateway/v1/internal/api_gateway_stub.h index d94a6de189afc..a0e1f55b004db 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_stub.h +++ b/google/cloud/apigateway/v1/internal/api_gateway_stub.h @@ -174,8 +174,9 @@ class DefaultApiGatewayServiceStub : public ApiGatewayServiceStub { google::cloud::apigateway::v1::ApiGatewayService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListGateways( grpc::ClientContext& context, Options const& options, @@ -322,7 +323,8 @@ class DefaultApiGatewayServiceStub : public ApiGatewayServiceStub { std::unique_ptr< google::cloud::apigateway::v1::ApiGatewayService::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub.cc b/google/cloud/apikeys/v2/internal/api_keys_stub.cc index 78bed76fd2570..aa19c80e4136f 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_stub.cc @@ -215,7 +215,7 @@ DefaultApiKeysStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -232,7 +232,8 @@ future DefaultApiKeysStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub.h b/google/cloud/apikeys/v2/internal/api_keys_stub.h index 41079dbaac072..83759ad184c58 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub.h +++ b/google/cloud/apikeys/v2/internal/api_keys_stub.h @@ -117,12 +117,9 @@ class DefaultApiKeysStub : public ApiKeysStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateKey( google::cloud::CompletionQueue& cq, @@ -200,7 +197,6 @@ class DefaultApiKeysStub : public ApiKeysStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc b/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc index 382f11e47158d..5195d11709456 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultApiKeysStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::api::apikeys::v2::ApiKeys::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/appengine/v1/internal/applications_stub.cc b/google/cloud/appengine/v1/internal/applications_stub.cc index e62e4e879dd0b..d91b01ce047bc 100644 --- a/google/cloud/appengine/v1/internal/applications_stub.cc +++ b/google/cloud/appengine/v1/internal/applications_stub.cc @@ -146,7 +146,7 @@ DefaultApplicationsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -163,7 +163,8 @@ future DefaultApplicationsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/appengine/v1/internal/applications_stub.h b/google/cloud/appengine/v1/internal/applications_stub.h index 1418a4a5f1261..bb4cccb85ba7f 100644 --- a/google/cloud/appengine/v1/internal/applications_stub.h +++ b/google/cloud/appengine/v1/internal/applications_stub.h @@ -95,8 +95,9 @@ class DefaultApplicationsStub : public ApplicationsStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr GetApplication( grpc::ClientContext& context, Options const& options, @@ -147,7 +148,8 @@ class DefaultApplicationsStub : public ApplicationsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/domain_mappings_stub.cc b/google/cloud/appengine/v1/internal/domain_mappings_stub.cc index 5a07a838774d6..3a9f8b71b9bce 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_stub.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_stub.cc @@ -158,7 +158,7 @@ DefaultDomainMappingsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -175,7 +175,8 @@ future DefaultDomainMappingsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/appengine/v1/internal/domain_mappings_stub.h b/google/cloud/appengine/v1/internal/domain_mappings_stub.h index 365dd51cee468..e8396daf9c3fb 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_stub.h +++ b/google/cloud/appengine/v1/internal/domain_mappings_stub.h @@ -100,8 +100,9 @@ class DefaultDomainMappingsStub : public DomainMappingsStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListDomainMappings( @@ -163,7 +164,8 @@ class DefaultDomainMappingsStub : public DomainMappingsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/instances_stub.cc b/google/cloud/appengine/v1/internal/instances_stub.cc index 4d281eb1a8783..0f0f648407573 100644 --- a/google/cloud/appengine/v1/internal/instances_stub.cc +++ b/google/cloud/appengine/v1/internal/instances_stub.cc @@ -124,7 +124,7 @@ DefaultInstancesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -141,7 +141,8 @@ future DefaultInstancesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/appengine/v1/internal/instances_stub.h b/google/cloud/appengine/v1/internal/instances_stub.h index ef92ef37156de..cb3e8d4316070 100644 --- a/google/cloud/appengine/v1/internal/instances_stub.h +++ b/google/cloud/appengine/v1/internal/instances_stub.h @@ -86,8 +86,9 @@ class DefaultInstancesStub : public InstancesStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -131,7 +132,8 @@ class DefaultInstancesStub : public InstancesStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/services_stub.cc b/google/cloud/appengine/v1/internal/services_stub.cc index 743851c09fe25..cec7dceabbee0 100644 --- a/google/cloud/appengine/v1/internal/services_stub.cc +++ b/google/cloud/appengine/v1/internal/services_stub.cc @@ -123,7 +123,7 @@ DefaultServicesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -140,7 +140,8 @@ future DefaultServicesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/appengine/v1/internal/services_stub.h b/google/cloud/appengine/v1/internal/services_stub.h index 31a85ae74a353..7b0d31246d9bb 100644 --- a/google/cloud/appengine/v1/internal/services_stub.h +++ b/google/cloud/appengine/v1/internal/services_stub.h @@ -85,8 +85,9 @@ class DefaultServicesStub : public ServicesStub { DefaultServicesStub( std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListServices( grpc::ClientContext& context, Options const& options, @@ -130,7 +131,8 @@ class DefaultServicesStub : public ServicesStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/appengine/v1/internal/versions_stub.cc b/google/cloud/appengine/v1/internal/versions_stub.cc index 48a7db37e88f2..1b99381ddda1a 100644 --- a/google/cloud/appengine/v1/internal/versions_stub.cc +++ b/google/cloud/appengine/v1/internal/versions_stub.cc @@ -151,7 +151,7 @@ DefaultVersionsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -168,7 +168,8 @@ future DefaultVersionsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/appengine/v1/internal/versions_stub.h b/google/cloud/appengine/v1/internal/versions_stub.h index a55ea3f99fe5c..5c117b15e2cb5 100644 --- a/google/cloud/appengine/v1/internal/versions_stub.h +++ b/google/cloud/appengine/v1/internal/versions_stub.h @@ -95,8 +95,9 @@ class DefaultVersionsStub : public VersionsStub { DefaultVersionsStub( std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListVersions( grpc::ClientContext& context, Options const& options, @@ -150,7 +151,8 @@ class DefaultVersionsStub : public VersionsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apphub/v1/internal/app_hub_stub.cc b/google/cloud/apphub/v1/internal/app_hub_stub.cc index 3d7b988b6ffb9..d8e5fcbfbcc84 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub.cc +++ b/google/cloud/apphub/v1/internal/app_hub_stub.cc @@ -680,7 +680,7 @@ DefaultAppHubStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -697,7 +697,8 @@ future DefaultAppHubStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/apphub/v1/internal/app_hub_stub.h b/google/cloud/apphub/v1/internal/app_hub_stub.h index cf1018f36dd6f..ab5ee09d662cf 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub.h +++ b/google/cloud/apphub/v1/internal/app_hub_stub.h @@ -307,18 +307,15 @@ class DefaultAppHubStub : public AppHubStub { DefaultAppHubStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr LookupServiceProjectAttachment( @@ -575,12 +572,11 @@ class DefaultAppHubStub : public AppHubStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc b/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc index b7bd13c4a9754..b514ecadaa409 100644 --- a/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc +++ b/google/cloud/apphub/v1/internal/app_hub_stub_factory.cc @@ -46,14 +46,12 @@ std::shared_ptr CreateDefaultAppHubStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::apphub::v1::AppHub::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc index 5decf441a89a2..ea27993733e4b 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.cc @@ -897,7 +897,7 @@ DefaultArtifactRegistryStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -914,7 +914,8 @@ future DefaultArtifactRegistryStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h index 9b03cc908c359..56aa1037d5e59 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub.h @@ -416,16 +416,13 @@ class DefaultArtifactRegistryStub : public ArtifactRegistryStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDockerImages( @@ -780,11 +777,10 @@ class DefaultArtifactRegistryStub : public ArtifactRegistryStub { std::unique_ptr< google::devtools::artifactregistry::v1::ArtifactRegistry::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc index 95a7a5d37c6ad..269be927b3334 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_stub_factory.cc @@ -47,14 +47,11 @@ std::shared_ptr CreateDefaultArtifactRegistryStub( auto service_grpc_stub = google::devtools::artifactregistry::v1::ArtifactRegistry::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/asset/v1/internal/asset_stub.cc b/google/cloud/asset/v1/internal/asset_stub.cc index 72cc282d6b2c0..def5c641f166a 100644 --- a/google/cloud/asset/v1/internal/asset_stub.cc +++ b/google/cloud/asset/v1/internal/asset_stub.cc @@ -372,7 +372,7 @@ DefaultAssetServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -389,7 +389,8 @@ future DefaultAssetServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/asset/v1/internal/asset_stub.h b/google/cloud/asset/v1/internal/asset_stub.h index 21a3fb42adb91..e692c365bb676 100644 --- a/google/cloud/asset/v1/internal/asset_stub.h +++ b/google/cloud/asset/v1/internal/asset_stub.h @@ -184,12 +184,9 @@ class DefaultAssetServiceStub : public AssetServiceStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncExportAssets( google::cloud::CompletionQueue& cq, @@ -336,7 +333,6 @@ class DefaultAssetServiceStub : public AssetServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/asset/v1/internal/asset_stub_factory.cc b/google/cloud/asset/v1/internal/asset_stub_factory.cc index 44b9a54f41392..c4b68909f7769 100644 --- a/google/cloud/asset/v1/internal/asset_stub_factory.cc +++ b/google/cloud/asset/v1/internal/asset_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAssetServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::asset::v1::AssetService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc index f59dbf9f4d182..ef6ad1c12f0b6 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.cc @@ -198,7 +198,7 @@ DefaultAssuredWorkloadsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -215,7 +215,8 @@ future DefaultAssuredWorkloadsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h index b77406127aae4..ec7b3e9897b3b 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub.h @@ -124,12 +124,9 @@ class DefaultAssuredWorkloadsServiceStub : public AssuredWorkloadsServiceStub { AssuredWorkloadsService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateWorkload( google::cloud::CompletionQueue& cq, @@ -213,7 +210,6 @@ class DefaultAssuredWorkloadsServiceStub : public AssuredWorkloadsServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc index 48d3f1857b7e8..42a8f6d9b788a 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_stub_factory.cc @@ -47,11 +47,9 @@ CreateDefaultAssuredWorkloadsServiceStub( auto service_grpc_stub = google::cloud::assuredworkloads::v1::AssuredWorkloadsService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/automl/v1/internal/auto_ml_stub.cc b/google/cloud/automl/v1/internal/auto_ml_stub.cc index 97ab93004846e..4ece2a2bc4141 100644 --- a/google/cloud/automl/v1/internal/auto_ml_stub.cc +++ b/google/cloud/automl/v1/internal/auto_ml_stub.cc @@ -409,7 +409,7 @@ DefaultAutoMlStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -426,7 +426,8 @@ future DefaultAutoMlStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/automl/v1/internal/auto_ml_stub.h b/google/cloud/automl/v1/internal/auto_ml_stub.h index 84be34232218a..d2d9a872271d5 100644 --- a/google/cloud/automl/v1/internal/auto_ml_stub.h +++ b/google/cloud/automl/v1/internal/auto_ml_stub.h @@ -188,8 +188,9 @@ class DefaultAutoMlStub : public AutoMlStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDataset( google::cloud::CompletionQueue& cq, @@ -335,7 +336,8 @@ class DefaultAutoMlStub : public AutoMlStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/automl/v1/internal/prediction_stub.cc b/google/cloud/automl/v1/internal/prediction_stub.cc index 90d204c492021..3baca91123a65 100644 --- a/google/cloud/automl/v1/internal/prediction_stub.cc +++ b/google/cloud/automl/v1/internal/prediction_stub.cc @@ -86,7 +86,7 @@ DefaultPredictionServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -103,7 +103,8 @@ future DefaultPredictionServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/automl/v1/internal/prediction_stub.h b/google/cloud/automl/v1/internal/prediction_stub.h index e67631bc5a0c0..d7405d242a2d0 100644 --- a/google/cloud/automl/v1/internal/prediction_stub.h +++ b/google/cloud/automl/v1/internal/prediction_stub.h @@ -73,8 +73,9 @@ class DefaultPredictionServiceStub : public PredictionServiceStub { google::cloud::automl::v1::PredictionService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr Predict( grpc::ClientContext& context, Options const& options, @@ -105,7 +106,8 @@ class DefaultPredictionServiceStub : public PredictionServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub.cc b/google/cloud/backupdr/v1/internal/backup_dr_stub.cc index 164dfc0100607..a1bd68773fb7c 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub.cc @@ -740,7 +740,7 @@ DefaultBackupDRStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -757,7 +757,8 @@ future DefaultBackupDRStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub.h b/google/cloud/backupdr/v1/internal/backup_dr_stub.h index c7fa71a0ddfc5..513bbbafafebc 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub.h +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub.h @@ -321,18 +321,15 @@ class DefaultBackupDRStub : public BackupDRStub { DefaultBackupDRStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListManagementServers( @@ -618,12 +615,11 @@ class DefaultBackupDRStub : public BackupDRStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc b/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc index 9fce672bb3fd2..ea806afe2edc9 100644 --- a/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc +++ b/google/cloud/backupdr/v1/internal/backup_dr_stub_factory.cc @@ -47,14 +47,12 @@ std::shared_ptr CreateDefaultBackupDRStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::backupdr::v1::BackupDR::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc index 98a5b7242fe3e..cc0bd2a5a49fd 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.cc @@ -932,7 +932,7 @@ DefaultBareMetalSolutionStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -949,7 +949,8 @@ future DefaultBareMetalSolutionStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h index b4231a3fb5023..41c3590b354e8 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_stub.h @@ -421,10 +421,10 @@ class DefaultBareMetalSolutionStub : public BareMetalSolutionStub { std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( @@ -798,7 +798,8 @@ class DefaultBareMetalSolutionStub : public BareMetalSolutionStub { grpc_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/batch/v1/internal/batch_stub.cc b/google/cloud/batch/v1/internal/batch_stub.cc index e34b81e0162d8..0001a3d7c43b8 100644 --- a/google/cloud/batch/v1/internal/batch_stub.cc +++ b/google/cloud/batch/v1/internal/batch_stub.cc @@ -198,7 +198,7 @@ DefaultBatchServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -215,7 +215,8 @@ future DefaultBatchServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/batch/v1/internal/batch_stub.h b/google/cloud/batch/v1/internal/batch_stub.h index c8ce1a8ba4ed9..321c0bdf2e596 100644 --- a/google/cloud/batch/v1/internal/batch_stub.h +++ b/google/cloud/batch/v1/internal/batch_stub.h @@ -112,16 +112,13 @@ class DefaultBatchServiceStub : public BatchServiceStub { DefaultBatchServiceStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateJob( grpc::ClientContext& context, Options const& options, @@ -192,11 +189,10 @@ class DefaultBatchServiceStub : public BatchServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/batch/v1/internal/batch_stub_factory.cc b/google/cloud/batch/v1/internal/batch_stub_factory.cc index 0bb2f4a1f83d5..2c17f0b50aed0 100644 --- a/google/cloud/batch/v1/internal/batch_stub_factory.cc +++ b/google/cloud/batch/v1/internal/batch_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultBatchServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::batch::v1::BatchService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc index 5606c720ca42f..15a0193938e31 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.cc @@ -294,7 +294,7 @@ DefaultAppConnectionsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -311,7 +311,8 @@ future DefaultAppConnectionsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h index 47432d6312e19..b8d334e0e9059 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub.h @@ -151,18 +151,15 @@ class DefaultAppConnectionsServiceStub : public AppConnectionsServiceStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::beyondcorp::appconnections::v1::ListAppConnectionsResponse> @@ -270,12 +267,11 @@ class DefaultAppConnectionsServiceStub : public AppConnectionsServiceStub { std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc index 363540a47b886..e70e8a2881d89 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_stub_factory.cc @@ -49,15 +49,13 @@ CreateDefaultAppConnectionsServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::beyondcorp::appconnections::v1:: AppConnectionsService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc index 60d5e29cf98cc..485c342489feb 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.cc @@ -309,7 +309,7 @@ DefaultAppConnectorsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -326,7 +326,8 @@ future DefaultAppConnectorsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h index 424586979b488..47a578a0ba116 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub.h @@ -156,18 +156,15 @@ class DefaultAppConnectorsServiceStub : public AppConnectorsServiceStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::beyondcorp::appconnectors::v1::ListAppConnectorsResponse> @@ -280,12 +277,11 @@ class DefaultAppConnectorsServiceStub : public AppConnectorsServiceStub { std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc index c883559c11a6d..ad05d1ab7cfcd 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultAppConnectorsServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::beyondcorp::appconnectors::v1:: AppConnectorsService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc index 7fd4ac3a89e93..f940a29c0ea84 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.cc @@ -241,7 +241,7 @@ DefaultAppGatewaysServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -258,7 +258,8 @@ future DefaultAppGatewaysServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h index 66b4957a34f5f..788d012b0b0be 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub.h @@ -136,18 +136,15 @@ class DefaultAppGatewaysServiceStub : public AppGatewaysServiceStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListAppGateways( @@ -237,12 +234,11 @@ class DefaultAppGatewaysServiceStub : public AppGatewaysServiceStub { std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc index fc43161af5d0e..ae7a851730fa4 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_stub_factory.cc @@ -48,15 +48,13 @@ std::shared_ptr CreateDefaultAppGatewaysServiceStub( auto service_grpc_stub = google::cloud::beyondcorp::appgateways::v1::AppGatewaysService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc index af9967f70e378..39d5b3d025e97 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.cc @@ -389,7 +389,7 @@ DefaultAnalyticsHubServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -406,7 +406,8 @@ future DefaultAnalyticsHubServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h index 46ae5f011cacc..9411ed3c00e2c 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_stub.h @@ -204,8 +204,9 @@ class DefaultAnalyticsHubServiceStub : public AnalyticsHubServiceStub { AnalyticsHubService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListDataExchanges( @@ -361,7 +362,8 @@ class DefaultAnalyticsHubServiceStub : public AnalyticsHubServiceStub { std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc index 888bf5b7e9e10..ad84d7837ee86 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.cc @@ -403,7 +403,7 @@ DefaultBigtableInstanceAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -420,7 +420,8 @@ future DefaultBigtableInstanceAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h index 3a9a49431c8ef..9c18b09aee1bc 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_stub.h @@ -190,8 +190,9 @@ class DefaultBigtableInstanceAdminStub : public BigtableInstanceAdminStub { google::bigtable::admin::v2::BigtableInstanceAdmin::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateInstance( google::cloud::CompletionQueue& cq, @@ -346,7 +347,8 @@ class DefaultBigtableInstanceAdminStub : public BigtableInstanceAdminStub { std::unique_ptr< google::bigtable::admin::v2::BigtableInstanceAdmin::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc index 43121e0484390..d32b2e533b747 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.cc @@ -488,7 +488,7 @@ DefaultBigtableTableAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -505,7 +505,8 @@ future DefaultBigtableTableAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h index e075af2310df7..a9215e79c7193 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_stub.h @@ -225,8 +225,9 @@ class DefaultBigtableTableAdminStub : public BigtableTableAdminStub { google::bigtable::admin::v2::BigtableTableAdmin::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr CreateTable( grpc::ClientContext& context, Options const& options, @@ -408,7 +409,8 @@ class DefaultBigtableTableAdminStub : public BigtableTableAdminStub { std::unique_ptr< google::bigtable::admin::v2::BigtableTableAdmin::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc index 242dfac07a95c..1ab7bdb79ca68 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.cc @@ -855,7 +855,7 @@ DefaultCertificateManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -872,7 +872,8 @@ future DefaultCertificateManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h index 3b3f3083fb580..c54fc642398be 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub.h @@ -384,16 +384,13 @@ class DefaultCertificateManagerStub : public CertificateManagerStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListCertificates( @@ -716,11 +713,10 @@ class DefaultCertificateManagerStub : public CertificateManagerStub { std::unique_ptr< google::cloud::certificatemanager::v1::CertificateManager::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc index 4fe99d145101a..711ad31705ca6 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_stub_factory.cc @@ -47,14 +47,11 @@ std::shared_ptr CreateDefaultCertificateManagerStub( auto service_grpc_stub = google::cloud::certificatemanager::v1::CertificateManager::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc index 7edbc5ad92170..aa567a8d3a89f 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc @@ -144,7 +144,7 @@ DefaultCloudChannelReportsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -161,7 +161,8 @@ future DefaultCloudChannelReportsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h index a1600a00323d0..3f9f864a9b297 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h @@ -95,12 +95,9 @@ class DefaultCloudChannelReportsServiceStub google::cloud::channel::v1::CloudChannelReportsService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncRunReportJob( google::cloud::CompletionQueue& cq, @@ -156,7 +153,6 @@ class DefaultCloudChannelReportsServiceStub grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc index 00cd0eda4b161..c9d47efa3b930 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc @@ -46,11 +46,9 @@ CreateDefaultCloudChannelReportsServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::channel::v1::CloudChannelReportsService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_stub.cc index 7d9825011c783..0ad92f342fa49 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_stub.cc @@ -921,7 +921,7 @@ DefaultCloudChannelServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -938,7 +938,8 @@ future DefaultCloudChannelServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub.h b/google/cloud/channel/v1/internal/cloud_channel_stub.h index e010a6cd5a62e..6b7bb835f04a8 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub.h +++ b/google/cloud/channel/v1/internal/cloud_channel_stub.h @@ -411,12 +411,9 @@ class DefaultCloudChannelServiceStub : public CloudChannelServiceStub { google::cloud::channel::v1::CloudChannelService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListCustomers( grpc::ClientContext& context, Options const& options, @@ -788,7 +785,6 @@ class DefaultCloudChannelServiceStub : public CloudChannelServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc b/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc index b15dc80a89bc4..88a5583af633a 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultCloudChannelServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::channel::v1::CloudChannelService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc index 50459cebaf8ee..1916fcf0bcc79 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.cc @@ -391,7 +391,7 @@ DefaultCloudBuildStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -408,7 +408,8 @@ future DefaultCloudBuildStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h index 3a48a73a9b9a6..216f206ebd9f9 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_stub.h @@ -199,8 +199,9 @@ class DefaultCloudBuildStub : public CloudBuildStub { google::devtools::cloudbuild::v1::CloudBuild::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateBuild( google::cloud::CompletionQueue& cq, @@ -359,7 +360,8 @@ class DefaultCloudBuildStub : public CloudBuildStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc index 9b7c4abb58dd9..443fdc9416b0f 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.cc @@ -390,7 +390,7 @@ DefaultRepositoryManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -407,7 +407,8 @@ future DefaultRepositoryManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h index e4af1716bd9b9..40ad0f305d4a2 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub.h @@ -204,15 +204,12 @@ class DefaultRepositoryManagerStub : public RepositoryManagerStub { std::unique_ptr< google::devtools::cloudbuild::v2::RepositoryManager::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateConnection( google::cloud::CompletionQueue& cq, @@ -366,10 +363,9 @@ class DefaultRepositoryManagerStub : public RepositoryManagerStub { std::unique_ptr< google::devtools::cloudbuild::v2::RepositoryManager::StubInterface> grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc index 5e57d7e1a4003..22e79cb252be1 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultRepositoryManagerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::devtools::cloudbuild::v2::RepositoryManager::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc index af1aa3fd15c12..7c32a24fc50e4 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.cc @@ -183,7 +183,7 @@ DefaultConsumerProcurementServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -200,7 +200,8 @@ future DefaultConsumerProcurementServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h index 1919ea5fce36e..9fe9b058d6397 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub.h @@ -112,12 +112,9 @@ class DefaultConsumerProcurementServiceStub ConsumerProcurementService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncPlaceOrder( google::cloud::CompletionQueue& cq, @@ -188,7 +185,6 @@ class DefaultConsumerProcurementServiceStub grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc index 5de920afb4fac..4d153314b72c2 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_stub_factory.cc @@ -47,11 +47,9 @@ CreateDefaultConsumerProcurementServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::commerce::consumer::procurement::v1:: ConsumerProcurementService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/composer/v1/internal/environments_stub.cc b/google/cloud/composer/v1/internal/environments_stub.cc index 6949c025250ac..7ebdb01c2a4ff 100644 --- a/google/cloud/composer/v1/internal/environments_stub.cc +++ b/google/cloud/composer/v1/internal/environments_stub.cc @@ -564,7 +564,7 @@ DefaultEnvironmentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -581,7 +581,8 @@ future DefaultEnvironmentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/composer/v1/internal/environments_stub.h b/google/cloud/composer/v1/internal/environments_stub.h index 80a3427b94bf2..4820fafa5acec 100644 --- a/google/cloud/composer/v1/internal/environments_stub.h +++ b/google/cloud/composer/v1/internal/environments_stub.h @@ -263,12 +263,9 @@ class DefaultEnvironmentsStub : public EnvironmentsStub { Environments::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateEnvironment( google::cloud::CompletionQueue& cq, @@ -493,7 +490,6 @@ class DefaultEnvironmentsStub : public EnvironmentsStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/composer/v1/internal/environments_stub_factory.cc b/google/cloud/composer/v1/internal/environments_stub_factory.cc index a035a895f3386..78409e6ece640 100644 --- a/google/cloud/composer/v1/internal/environments_stub_factory.cc +++ b/google/cloud/composer/v1/internal/environments_stub_factory.cc @@ -46,11 +46,9 @@ std::shared_ptr CreateDefaultEnvironmentsStub( auto service_grpc_stub = google::cloud::orchestration::airflow::service::v1::Environments::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/config/v1/internal/config_stub.cc b/google/cloud/config/v1/internal/config_stub.cc index b7519ebd02b5c..d8a1c33c02a1a 100644 --- a/google/cloud/config/v1/internal/config_stub.cc +++ b/google/cloud/config/v1/internal/config_stub.cc @@ -540,7 +540,7 @@ DefaultConfigStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -557,7 +557,8 @@ future DefaultConfigStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/config/v1/internal/config_stub.h b/google/cloud/config/v1/internal/config_stub.h index 3d869112f8986..da72d136e826a 100644 --- a/google/cloud/config/v1/internal/config_stub.h +++ b/google/cloud/config/v1/internal/config_stub.h @@ -246,18 +246,15 @@ class DefaultConfigStub : public ConfigStub { DefaultConfigStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDeployments( grpc::ClientContext& context, Options const& options, @@ -461,12 +458,11 @@ class DefaultConfigStub : public ConfigStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/config/v1/internal/config_stub_factory.cc b/google/cloud/config/v1/internal/config_stub_factory.cc index 902964f192724..e24c8dfd41525 100644 --- a/google/cloud/config/v1/internal/config_stub_factory.cc +++ b/google/cloud/config/v1/internal/config_stub_factory.cc @@ -46,14 +46,12 @@ std::shared_ptr CreateDefaultConfigStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::config::v1::Config::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/connectors/v1/internal/connectors_stub.cc b/google/cloud/connectors/v1/internal/connectors_stub.cc index e95b9c596aaa3..3d9df364f5794 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub.cc +++ b/google/cloud/connectors/v1/internal/connectors_stub.cc @@ -438,7 +438,7 @@ DefaultConnectorsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -455,7 +455,8 @@ future DefaultConnectorsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/connectors/v1/internal/connectors_stub.h b/google/cloud/connectors/v1/internal/connectors_stub.h index 1679fead384ad..5ff14c6de401d 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub.h +++ b/google/cloud/connectors/v1/internal/connectors_stub.h @@ -218,18 +218,15 @@ class DefaultConnectorsStub : public ConnectorsStub { DefaultConnectorsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListConnections(grpc::ClientContext& context, Options const& options, @@ -400,12 +397,11 @@ class DefaultConnectorsStub : public ConnectorsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/connectors/v1/internal/connectors_stub_factory.cc b/google/cloud/connectors/v1/internal/connectors_stub_factory.cc index 09358fb3b8bef..7a77292b3bb81 100644 --- a/google/cloud/connectors/v1/internal/connectors_stub_factory.cc +++ b/google/cloud/connectors/v1/internal/connectors_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultConnectorsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::connectors::v1::Connectors::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc index 6b26b4b95952a..ca95dc5b9918b 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.cc @@ -897,7 +897,7 @@ DefaultContactCenterInsightsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -914,7 +914,8 @@ future DefaultContactCenterInsightsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h index 3a8cc5cdd2461..fb7ea6b31b189 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub.h @@ -409,12 +409,9 @@ class DefaultContactCenterInsightsStub : public ContactCenterInsightsStub { ContactCenterInsights::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateConversation( @@ -767,7 +764,6 @@ class DefaultContactCenterInsightsStub : public ContactCenterInsightsStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc index 9d6f73c4615b2..cf7539a18ca4a 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_stub_factory.cc @@ -47,11 +47,9 @@ CreateDefaultContactCenterInsightsStub( auto service_grpc_stub = google::cloud::contactcenterinsights::v1::ContactCenterInsights::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc index 133e06a328cf1..636475244abbf 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.cc @@ -87,7 +87,7 @@ DefaultPipelineServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -104,7 +104,8 @@ future DefaultPipelineServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h index 17958b1b74be6..85dc61e3ef989 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub.h @@ -74,12 +74,9 @@ class DefaultPipelineServiceStub : public PipelineServiceStub { google::cloud::contentwarehouse::v1::PipelineService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncRunPipeline( google::cloud::CompletionQueue& cq, @@ -115,7 +112,6 @@ class DefaultPipelineServiceStub : public PipelineServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc b/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc index 5400c6e574945..84f3b406da6c4 100644 --- a/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc +++ b/google/cloud/contentwarehouse/v1/internal/pipeline_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultPipelineServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::contentwarehouse::v1::PipelineService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc index 9631b253523fa..467d84a47a7d9 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.cc @@ -347,7 +347,7 @@ DefaultLineageStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -364,7 +364,8 @@ future DefaultLineageStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h index 7bd4112b1af98..4a202cfdc2312 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub.h @@ -185,12 +185,9 @@ class DefaultLineageStub : public LineageStub { google::cloud::datacatalog::lineage::v1::Lineage::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr @@ -333,7 +330,6 @@ class DefaultLineageStub : public LineageStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc index 51aace160fe3b..4572c83e58e00 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultLineageStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::datacatalog::lineage::v1::Lineage::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc b/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc index 8ecaa50ea0eb2..2a38b2dc9fd3b 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub.cc @@ -534,7 +534,7 @@ DefaultDataCatalogStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -551,7 +551,8 @@ future DefaultDataCatalogStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub.h b/google/cloud/datacatalog/v1/internal/data_catalog_stub.h index a601fafcc1dcc..63412028fad8f 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub.h +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub.h @@ -248,12 +248,9 @@ class DefaultDataCatalogStub : public DataCatalogStub { google::cloud::datacatalog::v1::DataCatalog::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr SearchCatalog( grpc::ClientContext& context, Options const& options, @@ -466,7 +463,6 @@ class DefaultDataCatalogStub : public DataCatalogStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc b/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc index 87cecb71d33d5..0b235bec129f3 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultDataCatalogStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::datacatalog::v1::DataCatalog::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/datafusion/v1/internal/data_fusion_stub.cc b/google/cloud/datafusion/v1/internal/data_fusion_stub.cc index 5d6c307bc07ec..5f8d35c679980 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_stub.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_stub.cc @@ -201,7 +201,7 @@ DefaultDataFusionStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -218,7 +218,8 @@ future DefaultDataFusionStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datafusion/v1/internal/data_fusion_stub.h b/google/cloud/datafusion/v1/internal/data_fusion_stub.h index bd222f6aa6d53..9632710614bc4 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_stub.h +++ b/google/cloud/datafusion/v1/internal/data_fusion_stub.h @@ -112,8 +112,9 @@ class DefaultDataFusionStub : public DataFusionStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListAvailableVersions( @@ -194,7 +195,8 @@ class DefaultDataFusionStub : public DataFusionStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub.cc b/google/cloud/datamigration/v1/internal/data_migration_stub.cc index 5bd4721bf5eb0..3244738fc8d0c 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_stub.cc @@ -1136,7 +1136,7 @@ DefaultDataMigrationServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1153,7 +1153,8 @@ future DefaultDataMigrationServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub.h b/google/cloud/datamigration/v1/internal/data_migration_stub.h index 6f8436a5cf55d..4495f33620185 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub.h +++ b/google/cloud/datamigration/v1/internal/data_migration_stub.h @@ -490,18 +490,15 @@ class DefaultDataMigrationServiceStub : public DataMigrationServiceStub { std::unique_ptr< google::cloud::clouddms::v1::DataMigrationService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListMigrationJobs(grpc::ClientContext& context, Options const& options, @@ -936,12 +933,11 @@ class DefaultDataMigrationServiceStub : public DataMigrationServiceStub { std::unique_ptr< google::cloud::clouddms::v1::DataMigrationService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc b/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc index b1018c82d7270..4b4b698d5da11 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDataMigrationServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::clouddms::v1::DataMigrationService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataplex/v1/internal/catalog_stub.cc b/google/cloud/dataplex/v1/internal/catalog_stub.cc index 6ce655bca131e..09b1488b92559 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub.cc +++ b/google/cloud/dataplex/v1/internal/catalog_stub.cc @@ -581,7 +581,7 @@ DefaultCatalogServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -598,7 +598,8 @@ future DefaultCatalogServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataplex/v1/internal/catalog_stub.h b/google/cloud/dataplex/v1/internal/catalog_stub.h index 241bd8afd4069..e3447e2dae50e 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub.h +++ b/google/cloud/dataplex/v1/internal/catalog_stub.h @@ -250,18 +250,15 @@ class DefaultCatalogServiceStub : public CatalogServiceStub { std::unique_ptr< google::cloud::dataplex::v1::CatalogService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateEntryType( google::cloud::CompletionQueue& cq, @@ -480,12 +477,11 @@ class DefaultCatalogServiceStub : public CatalogServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc b/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc index 22ed07b5e9f32..030575b8f6763 100644 --- a/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/catalog_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultCatalogServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataplex::v1::CatalogService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub.cc b/google/cloud/dataplex/v1/internal/data_scan_stub.cc index 1e58830ebbe31..e07e76f68f99d 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_stub.cc @@ -313,7 +313,7 @@ DefaultDataScanServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -330,7 +330,8 @@ future DefaultDataScanServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub.h b/google/cloud/dataplex/v1/internal/data_scan_stub.h index 15959f65553b3..8194d87aec372 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub.h +++ b/google/cloud/dataplex/v1/internal/data_scan_stub.h @@ -157,18 +157,15 @@ class DefaultDataScanServiceStub : public DataScanServiceStub { std::unique_ptr< google::cloud::dataplex::v1::DataScanService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDataScan( google::cloud::CompletionQueue& cq, @@ -286,12 +283,11 @@ class DefaultDataScanServiceStub : public DataScanServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc b/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc index a7d49521a5550..22f30c6fc01dc 100644 --- a/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/data_scan_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDataScanServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataplex::v1::DataScanService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc index aaa374f749bf7..e2ed351342439 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.cc @@ -519,7 +519,7 @@ DefaultDataTaxonomyServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -536,7 +536,8 @@ future DefaultDataTaxonomyServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h index bd78b055e2121..ed8199fcf4994 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub.h @@ -247,18 +247,15 @@ class DefaultDataTaxonomyServiceStub : public DataTaxonomyServiceStub { std::unique_ptr< google::cloud::dataplex::v1::DataTaxonomyService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDataTaxonomy( google::cloud::CompletionQueue& cq, @@ -457,12 +454,11 @@ class DefaultDataTaxonomyServiceStub : public DataTaxonomyServiceStub { std::unique_ptr< google::cloud::dataplex::v1::DataTaxonomyService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc b/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc index 8c98777a1ec2a..8b022a9791757 100644 --- a/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/data_taxonomy_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDataTaxonomyServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataplex::v1::DataTaxonomyService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub.cc b/google/cloud/dataplex/v1/internal/dataplex_stub.cc index f459e7d1d7ebf..6bcc28b96ff6d 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_stub.cc @@ -804,7 +804,7 @@ DefaultDataplexServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -821,7 +821,8 @@ future DefaultDataplexServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub.h b/google/cloud/dataplex/v1/internal/dataplex_stub.h index 9508fd9105d3e..8f93b59e4d487 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub.h +++ b/google/cloud/dataplex/v1/internal/dataplex_stub.h @@ -327,18 +327,15 @@ class DefaultDataplexServiceStub : public DataplexServiceStub { std::unique_ptr< google::cloud::dataplex::v1::DataplexService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateLake( google::cloud::CompletionQueue& cq, @@ -624,12 +621,11 @@ class DefaultDataplexServiceStub : public DataplexServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc b/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc index a0837573d2940..c77cb9d46279c 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDataplexServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataplex::v1::DataplexService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub.cc b/google/cloud/dataproc/v1/internal/batch_controller_stub.cc index 4f263f05fc429..41f138ae07125 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub.cc @@ -190,7 +190,7 @@ DefaultBatchControllerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -207,7 +207,8 @@ future DefaultBatchControllerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub.h b/google/cloud/dataproc/v1/internal/batch_controller_stub.h index e5a3e369f8a60..671c8a668d575 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub.h @@ -111,15 +111,12 @@ class DefaultBatchControllerStub : public BatchControllerStub { std::unique_ptr< google::cloud::dataproc::v1::BatchController::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateBatch( google::cloud::CompletionQueue& cq, @@ -186,10 +183,9 @@ class DefaultBatchControllerStub : public BatchControllerStub { private: std::unique_ptr grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc index 28936d91b5648..ec5d6fc7cea66 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultBatchControllerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::BatchController::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc b/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc index c82fd7a45fef6..490cbd0cd299f 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub.cc @@ -329,7 +329,7 @@ DefaultClusterControllerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -346,7 +346,8 @@ future DefaultClusterControllerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub.h b/google/cloud/dataproc/v1/internal/cluster_controller_stub.h index aeee16815937f..153f8ccae188c 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub.h @@ -157,15 +157,12 @@ class DefaultClusterControllerStub : public ClusterControllerStub { std::unique_ptr< google::cloud::dataproc::v1::ClusterController::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateCluster( google::cloud::CompletionQueue& cq, @@ -286,10 +283,9 @@ class DefaultClusterControllerStub : public ClusterControllerStub { private: std::unique_ptr grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc index a2d296e814182..1c1c63261e50d 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultClusterControllerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::ClusterController::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub.cc b/google/cloud/dataproc/v1/internal/job_controller_stub.cc index 3140dd211fea3..128adaea218e9 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_stub.cc @@ -221,7 +221,7 @@ DefaultJobControllerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -238,7 +238,8 @@ future DefaultJobControllerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub.h b/google/cloud/dataproc/v1/internal/job_controller_stub.h index 11b6d09752828..c400280c5ccdb 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/job_controller_stub.h @@ -121,15 +121,12 @@ class DefaultJobControllerStub : public JobControllerStub { DefaultJobControllerStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr SubmitJob( grpc::ClientContext& context, Options const& options, @@ -208,10 +205,9 @@ class DefaultJobControllerStub : public JobControllerStub { private: std::unique_ptr grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc index 1bbd0716b6858..ee48edc105cd7 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultJobControllerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::JobController::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc b/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc index cc14770d4b59f..0dfe8a387f321 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub.cc @@ -197,7 +197,7 @@ DefaultNodeGroupControllerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -214,7 +214,8 @@ future DefaultNodeGroupControllerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub.h b/google/cloud/dataproc/v1/internal/node_group_controller_stub.h index e970f7a9ecc95..47054c7d25bf6 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub.h @@ -112,15 +112,12 @@ class DefaultNodeGroupControllerStub : public NodeGroupControllerStub { std::unique_ptr< google::cloud::dataproc::v1::NodeGroupController::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateNodeGroup( google::cloud::CompletionQueue& cq, @@ -194,10 +191,9 @@ class DefaultNodeGroupControllerStub : public NodeGroupControllerStub { std::unique_ptr< google::cloud::dataproc::v1::NodeGroupController::StubInterface> grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc index da0c8d12de2eb..003bfde28a3e1 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultNodeGroupControllerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::NodeGroupController::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub.cc b/google/cloud/dataproc/v1/internal/session_controller_stub.cc index 257c4905a32cd..ad369e5969203 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_stub.cc @@ -240,7 +240,7 @@ DefaultSessionControllerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -257,7 +257,8 @@ future DefaultSessionControllerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub.h b/google/cloud/dataproc/v1/internal/session_controller_stub.h index c280191f1325c..89bc759e3e5e0 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub.h +++ b/google/cloud/dataproc/v1/internal/session_controller_stub.h @@ -128,15 +128,12 @@ class DefaultSessionControllerStub : public SessionControllerStub { std::unique_ptr< google::cloud::dataproc::v1::SessionController::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateSession( google::cloud::CompletionQueue& cq, @@ -225,10 +222,9 @@ class DefaultSessionControllerStub : public SessionControllerStub { private: std::unique_ptr grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc b/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc index c50cbb1484750..6d68ad906a4de 100644 --- a/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/session_controller_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultSessionControllerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::SessionController::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub.cc b/google/cloud/dataproc/v1/internal/workflow_template_stub.cc index 4c450596558e2..c67c534831df6 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub.cc @@ -260,7 +260,7 @@ DefaultWorkflowTemplateServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -277,7 +277,8 @@ future DefaultWorkflowTemplateServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub.h b/google/cloud/dataproc/v1/internal/workflow_template_stub.h index 35fac5984564d..a1c77143f0b67 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub.h +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub.h @@ -143,15 +143,12 @@ class DefaultWorkflowTemplateServiceStub : public WorkflowTemplateServiceStub { std::unique_ptr< google::cloud::dataproc::v1::WorkflowTemplateService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateWorkflowTemplate( @@ -251,10 +248,9 @@ class DefaultWorkflowTemplateServiceStub : public WorkflowTemplateServiceStub { std::unique_ptr< google::cloud::dataproc::v1::WorkflowTemplateService::StubInterface> grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc b/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc index e005aa76c358b..6426cf1ed81e3 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_stub_factory.cc @@ -47,13 +47,10 @@ CreateDefaultWorkflowTemplateServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dataproc::v1::WorkflowTemplateService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc index 1a2e7db0a4e8e..a0f65d13304d6 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.cc @@ -232,7 +232,7 @@ DefaultDatastoreAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -249,7 +249,8 @@ future DefaultDatastoreAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h index 3fb62a21aa29c..2265f2417937e 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub.h @@ -123,12 +123,9 @@ class DefaultDatastoreAdminStub : public DatastoreAdminStub { google::datastore::admin::v1::DatastoreAdmin::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncExportEntities( google::cloud::CompletionQueue& cq, @@ -215,7 +212,6 @@ class DefaultDatastoreAdminStub : public DatastoreAdminStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc index d7bb7f99e4b12..3bc370a35ff10 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultDatastoreAdminStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::datastore::admin::v1::DatastoreAdmin::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/datastream/v1/internal/datastream_stub.cc b/google/cloud/datastream/v1/internal/datastream_stub.cc index 1441d45468e29..570192023d522 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub.cc +++ b/google/cloud/datastream/v1/internal/datastream_stub.cc @@ -617,7 +617,7 @@ DefaultDatastreamStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -634,7 +634,8 @@ future DefaultDatastreamStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/datastream/v1/internal/datastream_stub.h b/google/cloud/datastream/v1/internal/datastream_stub.h index efa22c1c89196..a48b235ba35b7 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub.h +++ b/google/cloud/datastream/v1/internal/datastream_stub.h @@ -279,16 +279,13 @@ class DefaultDatastreamStub : public DatastreamStub { DefaultDatastreamStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListConnectionProfiles( @@ -527,11 +524,10 @@ class DefaultDatastreamStub : public DatastreamStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/datastream/v1/internal/datastream_stub_factory.cc b/google/cloud/datastream/v1/internal/datastream_stub_factory.cc index 02c622536ce8c..67a346705683f 100644 --- a/google/cloud/datastream/v1/internal/datastream_stub_factory.cc +++ b/google/cloud/datastream/v1/internal/datastream_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultDatastreamStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::datastream::v1::Datastream::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc b/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc index 6b62764023430..0bb035dee2c1b 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub.cc @@ -998,7 +998,7 @@ DefaultCloudDeployStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1015,7 +1015,8 @@ future DefaultCloudDeployStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub.h b/google/cloud/deploy/v1/internal/cloud_deploy_stub.h index 66cad8fdb6cf2..4e84fdb382db5 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub.h +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub.h @@ -420,18 +420,15 @@ class DefaultCloudDeployStub : public CloudDeployStub { DefaultCloudDeployStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDeliveryPipelines( @@ -804,12 +801,11 @@ class DefaultCloudDeployStub : public CloudDeployStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc b/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc index 824b5e57c3fee..fdeb8c2193a85 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultCloudDeployStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::deploy::v1::CloudDeploy::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc b/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc index a597880ef1189..49ebca89b004a 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub.cc @@ -401,7 +401,7 @@ DefaultDeveloperConnectStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -418,7 +418,8 @@ future DefaultDeveloperConnectStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub.h b/google/cloud/developerconnect/v1/internal/developer_connect_stub.h index be93d8de0c968..15c2a16082008 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub.h +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub.h @@ -204,16 +204,13 @@ class DefaultDeveloperConnectStub : public DeveloperConnectStub { std::unique_ptr< google::cloud::developerconnect::v1::DeveloperConnect::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListConnections( @@ -369,11 +366,10 @@ class DefaultDeveloperConnectStub : public DeveloperConnectStub { std::unique_ptr< google::cloud::developerconnect::v1::DeveloperConnect::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc b/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc index 1eee1fadd74ad..76533bf4e8237 100644 --- a/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc +++ b/google/cloud/developerconnect/v1/internal/developer_connect_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultDeveloperConnectStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::developerconnect::v1::DeveloperConnect::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/agents_stub.cc b/google/cloud/dialogflow_cx/internal/agents_stub.cc index dcfb21c760758..4a55e1aa0899d 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub.cc +++ b/google/cloud/dialogflow_cx/internal/agents_stub.cc @@ -272,7 +272,7 @@ DefaultAgentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -289,7 +289,8 @@ future DefaultAgentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/agents_stub.h b/google/cloud/dialogflow_cx/internal/agents_stub.h index f30fdaea084e0..9e4f91c087016 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub.h +++ b/google/cloud/dialogflow_cx/internal/agents_stub.h @@ -145,16 +145,13 @@ class DefaultAgentsStub : public AgentsStub { DefaultAgentsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListAgents( grpc::ClientContext& context, Options const& options, @@ -263,11 +260,10 @@ class DefaultAgentsStub : public AgentsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc b/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc index 96fa43fd7529e..e8e17f0752a14 100644 --- a/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/agents_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultAgentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::Agents::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub.cc b/google/cloud/dialogflow_cx/internal/entity_types_stub.cc index 779f49759aa40..a2c08b990a0a6 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub.cc @@ -226,7 +226,7 @@ DefaultEntityTypesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -243,7 +243,8 @@ future DefaultEntityTypesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub.h b/google/cloud/dialogflow_cx/internal/entity_types_stub.h index 276f1c2132806..898b19e3e4a6f 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub.h +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub.h @@ -133,16 +133,13 @@ class DefaultEntityTypesStub : public EntityTypesStub { std::unique_ptr< google::cloud::dialogflow::cx::v3::EntityTypes::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetEntityType( grpc::ClientContext& context, Options const& options, @@ -229,11 +226,10 @@ class DefaultEntityTypesStub : public EntityTypesStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc b/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc index 47bee1e6d883c..93d1fd496defc 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultEntityTypesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::EntityTypes::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/environments_stub.cc b/google/cloud/dialogflow_cx/internal/environments_stub.cc index 4325131259394..a791dfc01384a 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub.cc +++ b/google/cloud/dialogflow_cx/internal/environments_stub.cc @@ -295,7 +295,7 @@ DefaultEnvironmentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -312,7 +312,8 @@ future DefaultEnvironmentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/environments_stub.h b/google/cloud/dialogflow_cx/internal/environments_stub.h index 2e3037d690204..2f3dccf245290 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub.h +++ b/google/cloud/dialogflow_cx/internal/environments_stub.h @@ -159,16 +159,13 @@ class DefaultEnvironmentsStub : public EnvironmentsStub { std::unique_ptr< google::cloud::dialogflow::cx::v3::Environments::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListEnvironments( @@ -282,11 +279,10 @@ class DefaultEnvironmentsStub : public EnvironmentsStub { std::unique_ptr< google::cloud::dialogflow::cx::v3::Environments::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc b/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc index c521942d1f2c5..027be8f1cb724 100644 --- a/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/environments_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultEnvironmentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::Environments::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/flows_stub.cc b/google/cloud/dialogflow_cx/internal/flows_stub.cc index f31100900dc89..b6d178b804618 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub.cc +++ b/google/cloud/dialogflow_cx/internal/flows_stub.cc @@ -272,7 +272,7 @@ DefaultFlowsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -289,7 +289,8 @@ future DefaultFlowsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/flows_stub.h b/google/cloud/dialogflow_cx/internal/flows_stub.h index 7c35dee108fb0..569730071d37b 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub.h +++ b/google/cloud/dialogflow_cx/internal/flows_stub.h @@ -141,16 +141,13 @@ class DefaultFlowsStub : public FlowsStub { DefaultFlowsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateFlow( grpc::ClientContext& context, Options const& options, @@ -258,11 +255,10 @@ class DefaultFlowsStub : public FlowsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc b/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc index 99c32f5a9154d..e7fbac9ded224 100644 --- a/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/flows_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultFlowsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::Flows::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/intents_stub.cc b/google/cloud/dialogflow_cx/internal/intents_stub.cc index b3829570d08d4..ba731b07e5820 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub.cc +++ b/google/cloud/dialogflow_cx/internal/intents_stub.cc @@ -220,7 +220,7 @@ DefaultIntentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -237,7 +237,8 @@ future DefaultIntentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/intents_stub.h b/google/cloud/dialogflow_cx/internal/intents_stub.h index 64c07df5db5fd..cf2d49a28c2a6 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub.h +++ b/google/cloud/dialogflow_cx/internal/intents_stub.h @@ -126,16 +126,13 @@ class DefaultIntentsStub : public IntentsStub { DefaultIntentsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListIntents( grpc::ClientContext& context, Options const& options, @@ -221,11 +218,10 @@ class DefaultIntentsStub : public IntentsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc b/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc index 44561e03ce745..5d041ebdcef7b 100644 --- a/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/intents_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultIntentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::Intents::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub.cc b/google/cloud/dialogflow_cx/internal/test_cases_stub.cc index 2ac722c31563c..7cc653abdd904 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub.cc @@ -323,7 +323,7 @@ DefaultTestCasesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -340,7 +340,8 @@ future DefaultTestCasesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub.h b/google/cloud/dialogflow_cx/internal/test_cases_stub.h index de4374c7d0e32..4666e4eee91fc 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub.h +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub.h @@ -169,16 +169,13 @@ class DefaultTestCasesStub : public TestCasesStub { std::unique_ptr< google::cloud::dialogflow::cx::v3::TestCases::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListTestCases(grpc::ClientContext& context, Options const& options, @@ -305,11 +302,10 @@ class DefaultTestCasesStub : public TestCasesStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc b/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc index 72f81cfa2bb91..0bc3ca4878bf6 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultTestCasesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::TestCases::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_cx/internal/versions_stub.cc b/google/cloud/dialogflow_cx/internal/versions_stub.cc index 5552bd8351821..442ebb64bf6a1 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub.cc +++ b/google/cloud/dialogflow_cx/internal/versions_stub.cc @@ -220,7 +220,7 @@ DefaultVersionsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -237,7 +237,8 @@ future DefaultVersionsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_cx/internal/versions_stub.h b/google/cloud/dialogflow_cx/internal/versions_stub.h index ea1fdd87b6304..b5b3d202cc9fc 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub.h +++ b/google/cloud/dialogflow_cx/internal/versions_stub.h @@ -127,16 +127,13 @@ class DefaultVersionsStub : public VersionsStub { std::unique_ptr< google::cloud::dialogflow::cx::v3::Versions::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListVersions(grpc::ClientContext& context, Options const& options, @@ -223,11 +220,10 @@ class DefaultVersionsStub : public VersionsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc b/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc index cd90f02eeab24..900ac939e0b0b 100644 --- a/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc +++ b/google/cloud/dialogflow_cx/internal/versions_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultVersionsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::cx::v3::Versions::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/agents_stub.cc b/google/cloud/dialogflow_es/internal/agents_stub.cc index f72c41d0b92f3..29cdea7fcf52c 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub.cc +++ b/google/cloud/dialogflow_es/internal/agents_stub.cc @@ -274,7 +274,7 @@ DefaultAgentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -291,7 +291,8 @@ future DefaultAgentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/agents_stub.h b/google/cloud/dialogflow_es/internal/agents_stub.h index 9192b5b3c390e..5dd099fec530f 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub.h +++ b/google/cloud/dialogflow_es/internal/agents_stub.h @@ -142,16 +142,13 @@ class DefaultAgentsStub : public AgentsStub { DefaultAgentsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetAgent( grpc::ClientContext& context, Options const& options, @@ -256,11 +253,10 @@ class DefaultAgentsStub : public AgentsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/agents_stub_factory.cc b/google/cloud/dialogflow_es/internal/agents_stub_factory.cc index 113605d9e8ea1..ef6eac42e88e2 100644 --- a/google/cloud/dialogflow_es/internal/agents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/agents_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultAgentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::Agents::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc index e229685280de0..a6871b3669eaf 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.cc @@ -235,7 +235,7 @@ DefaultConversationDatasetsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -252,7 +252,8 @@ future DefaultConversationDatasetsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h index c3ad819dd3325..e81ee6255998f 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub.h @@ -131,16 +131,13 @@ class DefaultConversationDatasetsStub : public ConversationDatasetsStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationDatasets::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateConversationDataset( @@ -228,11 +225,10 @@ class DefaultConversationDatasetsStub : public ConversationDatasetsStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationDatasets::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc index 0b25dffd089dd..736bd848375a9 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultConversationDatasetsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::ConversationDatasets::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub.cc b/google/cloud/dialogflow_es/internal/conversation_models_stub.cc index 5e9adfa10c1c3..7ec52c36c1ed8 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub.cc @@ -334,7 +334,7 @@ DefaultConversationModelsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -351,7 +351,8 @@ future DefaultConversationModelsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub.h b/google/cloud/dialogflow_es/internal/conversation_models_stub.h index c56cfd3d9453c..b06aedf3e20e7 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub.h @@ -171,16 +171,13 @@ class DefaultConversationModelsStub : public ConversationModelsStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationModels::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateConversationModel( google::cloud::CompletionQueue& cq, @@ -305,11 +302,10 @@ class DefaultConversationModelsStub : public ConversationModelsStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationModels::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc index b9d66a90addad..b9588a62a1527 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultConversationModelsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::ConversationModels::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc index c5955f1cbd1ce..738c66e6d2e1e 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.cc @@ -242,7 +242,7 @@ DefaultConversationProfilesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -259,7 +259,8 @@ future DefaultConversationProfilesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h index af4e56fb001f1..95a6150935be2 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub.h @@ -135,16 +135,13 @@ class DefaultConversationProfilesStub : public ConversationProfilesStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationProfiles::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListConversationProfiles( @@ -237,11 +234,10 @@ class DefaultConversationProfilesStub : public ConversationProfilesStub { std::unique_ptr< google::cloud::dialogflow::v2::ConversationProfiles::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc index 906c0e3cb6f96..9c8701f862472 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultConversationProfilesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::ConversationProfiles::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/documents_stub.cc b/google/cloud/dialogflow_es/internal/documents_stub.cc index e03a01ec0b1a1..75d7de091e12d 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub.cc +++ b/google/cloud/dialogflow_es/internal/documents_stub.cc @@ -305,7 +305,7 @@ DefaultDocumentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -322,7 +322,8 @@ future DefaultDocumentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/documents_stub.h b/google/cloud/dialogflow_es/internal/documents_stub.h index 566c47574a867..f50bb26d6c28c 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub.h +++ b/google/cloud/dialogflow_es/internal/documents_stub.h @@ -147,16 +147,13 @@ class DefaultDocumentsStub : public DocumentsStub { DefaultDocumentsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDocuments( grpc::ClientContext& context, Options const& options, @@ -275,11 +272,10 @@ class DefaultDocumentsStub : public DocumentsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/documents_stub_factory.cc b/google/cloud/dialogflow_es/internal/documents_stub_factory.cc index 70b1caa452503..2c80903dd0bd1 100644 --- a/google/cloud/dialogflow_es/internal/documents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/documents_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultDocumentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::Documents::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc b/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc index cbe765f02987d..491be95e26fa0 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub.cc @@ -150,7 +150,7 @@ DefaultEncryptionSpecServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -167,7 +167,8 @@ future DefaultEncryptionSpecServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub.h b/google/cloud/dialogflow_es/internal/encryption_spec_stub.h index 261d4fce0e90f..260f3cf97bc00 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub.h +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub.h @@ -98,16 +98,13 @@ class DefaultEncryptionSpecServiceStub : public EncryptionSpecServiceStub { std::unique_ptr< google::cloud::dialogflow::v2::EncryptionSpecService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetEncryptionSpec( grpc::ClientContext& context, Options const& options, @@ -163,11 +160,10 @@ class DefaultEncryptionSpecServiceStub : public EncryptionSpecServiceStub { std::unique_ptr< google::cloud::dialogflow::v2::EncryptionSpecService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc b/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc index a4dab52115522..e04be4a282aee 100644 --- a/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/encryption_spec_stub_factory.cc @@ -47,14 +47,11 @@ CreateDefaultEncryptionSpecServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::EncryptionSpecService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub.cc b/google/cloud/dialogflow_es/internal/entity_types_stub.cc index d5c76850d382a..88d39297fbd93 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_stub.cc @@ -321,7 +321,7 @@ DefaultEntityTypesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -338,7 +338,8 @@ future DefaultEntityTypesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub.h b/google/cloud/dialogflow_es/internal/entity_types_stub.h index dfaf0caccac0e..fea939fcab29b 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub.h +++ b/google/cloud/dialogflow_es/internal/entity_types_stub.h @@ -168,16 +168,13 @@ class DefaultEntityTypesStub : public EntityTypesStub { DefaultEntityTypesStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListEntityTypes(grpc::ClientContext& context, Options const& options, @@ -299,11 +296,10 @@ class DefaultEntityTypesStub : public EntityTypesStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc b/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc index 68c846e711f4e..ebbe7dac4011f 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultEntityTypesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::EntityTypes::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/dialogflow_es/internal/intents_stub.cc b/google/cloud/dialogflow_es/internal/intents_stub.cc index 69635d1bf1658..eecf78a0e437d 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub.cc +++ b/google/cloud/dialogflow_es/internal/intents_stub.cc @@ -219,7 +219,7 @@ DefaultIntentsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -236,7 +236,8 @@ future DefaultIntentsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/dialogflow_es/internal/intents_stub.h b/google/cloud/dialogflow_es/internal/intents_stub.h index 9ffb8226d020d..60f357412e85e 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub.h +++ b/google/cloud/dialogflow_es/internal/intents_stub.h @@ -126,16 +126,13 @@ class DefaultIntentsStub : public IntentsStub { DefaultIntentsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListIntents( grpc::ClientContext& context, Options const& options, @@ -219,11 +216,10 @@ class DefaultIntentsStub : public IntentsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/dialogflow_es/internal/intents_stub_factory.cc b/google/cloud/dialogflow_es/internal/intents_stub_factory.cc index 673f5ee890c11..83fea3c9d75b7 100644 --- a/google/cloud/dialogflow_es/internal/intents_stub_factory.cc +++ b/google/cloud/dialogflow_es/internal/intents_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultIntentsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::dialogflow::v2::Intents::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub.cc b/google/cloud/discoveryengine/v1/internal/completion_stub.cc index 037190a3108b5..a34b063ab96ab 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_stub.cc @@ -231,7 +231,7 @@ DefaultCompletionServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -248,7 +248,8 @@ future DefaultCompletionServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub.h b/google/cloud/discoveryengine/v1/internal/completion_stub.h index 5990f3b88ca64..209aac0ab06b7 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub.h +++ b/google/cloud/discoveryengine/v1/internal/completion_stub.h @@ -129,12 +129,9 @@ class DefaultCompletionServiceStub : public CompletionServiceStub { google::cloud::discoveryengine::v1::CompletionService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CompleteQuery(grpc::ClientContext& context, Options const& options, @@ -223,7 +220,6 @@ class DefaultCompletionServiceStub : public CompletionServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc index 2948333825f87..e68387de4dba8 100644 --- a/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/completion_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultCompletionServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::CompletionService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub.cc b/google/cloud/discoveryengine/v1/internal/data_store_stub.cc index c62b5c43d07c5..77adc23b091f8 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub.cc @@ -177,7 +177,7 @@ DefaultDataStoreServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -194,7 +194,8 @@ future DefaultDataStoreServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub.h b/google/cloud/discoveryengine/v1/internal/data_store_stub.h index 6fb36e5e9b5e5..6619c1d598740 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub.h +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub.h @@ -111,12 +111,9 @@ class DefaultDataStoreServiceStub : public DataStoreServiceStub { google::cloud::discoveryengine::v1::DataStoreService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateDataStore( google::cloud::CompletionQueue& cq, @@ -188,7 +185,6 @@ class DefaultDataStoreServiceStub : public DataStoreServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc index 36bfae60a53a4..b5ae58facd084 100644 --- a/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/data_store_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultDataStoreServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::DataStoreService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/document_stub.cc b/google/cloud/discoveryengine/v1/internal/document_stub.cc index cccfe702ba76e..1afd2442621eb 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/document_stub.cc @@ -215,7 +215,7 @@ DefaultDocumentServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -232,7 +232,8 @@ future DefaultDocumentServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/document_stub.h b/google/cloud/discoveryengine/v1/internal/document_stub.h index 5e5652a7ff16c..6beea70424212 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub.h +++ b/google/cloud/discoveryengine/v1/internal/document_stub.h @@ -126,12 +126,9 @@ class DefaultDocumentServiceStub : public DocumentServiceStub { google::cloud::discoveryengine::v1::DocumentService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetDocument( grpc::ClientContext& context, Options const& options, @@ -219,7 +216,6 @@ class DefaultDocumentServiceStub : public DocumentServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc index 39f7c5be76d52..9bdba67dbe15c 100644 --- a/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/document_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultDocumentServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::DocumentService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub.cc b/google/cloud/discoveryengine/v1/internal/engine_stub.cc index dd098fa2df838..2d15feb2bb232 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_stub.cc @@ -174,7 +174,7 @@ DefaultEngineServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -191,7 +191,8 @@ future DefaultEngineServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub.h b/google/cloud/discoveryengine/v1/internal/engine_stub.h index 85dd8a860f62e..3b1e021dead75 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub.h +++ b/google/cloud/discoveryengine/v1/internal/engine_stub.h @@ -108,12 +108,9 @@ class DefaultEngineServiceStub : public EngineServiceStub { google::cloud::discoveryengine::v1::EngineService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateEngine( google::cloud::CompletionQueue& cq, @@ -184,7 +181,6 @@ class DefaultEngineServiceStub : public EngineServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc index aa17424d54d06..98a5a25c1c8e8 100644 --- a/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/engine_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultEngineServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::EngineService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/project_stub.cc b/google/cloud/discoveryengine/v1/internal/project_stub.cc index 510ae36a3730f..5d59bf7362b49 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/project_stub.cc @@ -112,7 +112,7 @@ DefaultProjectServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -129,7 +129,8 @@ future DefaultProjectServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/project_stub.h b/google/cloud/discoveryengine/v1/internal/project_stub.h index 540ee2264a516..fd6da5e8aaa5a 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub.h +++ b/google/cloud/discoveryengine/v1/internal/project_stub.h @@ -83,12 +83,9 @@ class DefaultProjectServiceStub : public ProjectServiceStub { google::cloud::discoveryengine::v1::ProjectService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncProvisionProject( google::cloud::CompletionQueue& cq, @@ -132,7 +129,6 @@ class DefaultProjectServiceStub : public ProjectServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc index 0c7b81e4e1e9d..e2ca3b19a60cf 100644 --- a/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/project_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultProjectServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::ProjectService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub.cc b/google/cloud/discoveryengine/v1/internal/schema_stub.cc index c02a840248b9a..833fb62641cec 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_stub.cc @@ -192,7 +192,7 @@ DefaultSchemaServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -209,7 +209,8 @@ future DefaultSchemaServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub.h b/google/cloud/discoveryengine/v1/internal/schema_stub.h index 4063c0c6ec900..9df5d222e280c 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub.h +++ b/google/cloud/discoveryengine/v1/internal/schema_stub.h @@ -115,12 +115,9 @@ class DefaultSchemaServiceStub : public SchemaServiceStub { google::cloud::discoveryengine::v1::SchemaService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetSchema( grpc::ClientContext& context, Options const& options, @@ -198,7 +195,6 @@ class DefaultSchemaServiceStub : public SchemaServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc index 3caf1e2d074e8..9173a97a662ce 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultSchemaServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::SchemaService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc index 0f7abae18f4f7..d3ada23cfccca 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.cc @@ -398,7 +398,7 @@ DefaultSiteSearchEngineServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -415,7 +415,8 @@ future DefaultSiteSearchEngineServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h index 2c02c3769b980..a01c4836399cd 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub.h @@ -197,12 +197,9 @@ class DefaultSiteSearchEngineServiceStub : public SiteSearchEngineServiceStub { SiteSearchEngineService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetSiteSearchEngine( @@ -356,7 +353,6 @@ class DefaultSiteSearchEngineServiceStub : public SiteSearchEngineServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc index 3012a518cb1e6..f1b61082ee684 100644 --- a/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/site_search_engine_stub_factory.cc @@ -47,11 +47,9 @@ CreateDefaultSiteSearchEngineServiceStub( auto service_grpc_stub = google::cloud::discoveryengine::v1::SiteSearchEngineService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub.cc b/google/cloud/discoveryengine/v1/internal/user_event_stub.cc index d1b690d0aac51..f9394dd5cdaf7 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub.cc @@ -167,7 +167,7 @@ DefaultUserEventServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -184,7 +184,8 @@ future DefaultUserEventServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub.h b/google/cloud/discoveryengine/v1/internal/user_event_stub.h index cef4e0bf47951..b086feb43de1e 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub.h +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub.h @@ -106,12 +106,9 @@ class DefaultUserEventServiceStub : public UserEventServiceStub { google::cloud::discoveryengine::v1::UserEventService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr WriteUserEvent( grpc::ClientContext& context, Options const& options, @@ -177,7 +174,6 @@ class DefaultUserEventServiceStub : public UserEventServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc b/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc index 0911f885126fd..664c38fc50bff 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultUserEventServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::discoveryengine::v1::UserEventService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/documentai/v1/internal/document_processor_stub.cc b/google/cloud/documentai/v1/internal/document_processor_stub.cc index 04eb6da8661b8..59d0ded16abc4 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub.cc +++ b/google/cloud/documentai/v1/internal/document_processor_stub.cc @@ -596,7 +596,7 @@ DefaultDocumentProcessorServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -613,7 +613,8 @@ future DefaultDocumentProcessorServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/documentai/v1/internal/document_processor_stub.h b/google/cloud/documentai/v1/internal/document_processor_stub.h index 96ef22275b4c7..cbb68f71430e7 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub.h +++ b/google/cloud/documentai/v1/internal/document_processor_stub.h @@ -268,16 +268,13 @@ class DefaultDocumentProcessorServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ProcessDocument( grpc::ClientContext& context, Options const& options, @@ -507,11 +504,10 @@ class DefaultDocumentProcessorServiceStub std::unique_ptr< google::cloud::documentai::v1::DocumentProcessorService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc b/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc index 5fb039fb3600d..c035d14a16940 100644 --- a/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc +++ b/google/cloud/documentai/v1/internal/document_processor_stub_factory.cc @@ -47,14 +47,11 @@ CreateDefaultDocumentProcessorServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::documentai::v1::DocumentProcessorService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/domains/v1/internal/domains_stub.cc b/google/cloud/domains/v1/internal/domains_stub.cc index e5af26ca4ca98..a8cf6bdf465c4 100644 --- a/google/cloud/domains/v1/internal/domains_stub.cc +++ b/google/cloud/domains/v1/internal/domains_stub.cc @@ -384,7 +384,7 @@ DefaultDomainsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -401,7 +401,8 @@ future DefaultDomainsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/domains/v1/internal/domains_stub.h b/google/cloud/domains/v1/internal/domains_stub.h index 820bfbbf26bdc..4e1eb80ec975d 100644 --- a/google/cloud/domains/v1/internal/domains_stub.h +++ b/google/cloud/domains/v1/internal/domains_stub.h @@ -189,8 +189,9 @@ class DefaultDomainsStub : public DomainsStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr SearchDomains( grpc::ClientContext& context, Options const& options, @@ -343,7 +344,8 @@ class DefaultDomainsStub : public DomainsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc b/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc index 28e53e849d04a..8baddf499d022 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub.cc @@ -532,7 +532,7 @@ DefaultEdgeContainerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -549,7 +549,8 @@ future DefaultEdgeContainerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub.h b/google/cloud/edgecontainer/v1/internal/edge_container_stub.h index a880a60a84088..65d2470933710 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub.h +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub.h @@ -252,16 +252,13 @@ class DefaultEdgeContainerStub : public EdgeContainerStub { std::unique_ptr< google::cloud::edgecontainer::v1::EdgeContainer::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListClusters( grpc::ClientContext& context, Options const& options, @@ -469,11 +466,10 @@ class DefaultEdgeContainerStub : public EdgeContainerStub { std::unique_ptr< google::cloud::edgecontainer::v1::EdgeContainer::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc b/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc index fefaee1dd0ac2..a00a8a42569cf 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultEdgeContainerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::edgecontainer::v1::EdgeContainer::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc index f3c05e9e96756..7e9a87379c071 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc @@ -612,7 +612,7 @@ DefaultEdgeNetworkStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -629,7 +629,8 @@ future DefaultEdgeNetworkStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h index 6422fea49ffdd..13169918cde90 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h @@ -269,16 +269,13 @@ class DefaultEdgeNetworkStub : public EdgeNetworkStub { std::unique_ptr< google::cloud::edgenetwork::v1::EdgeNetwork::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr InitializeZone(grpc::ClientContext& context, Options const& options, @@ -521,11 +518,10 @@ class DefaultEdgeNetworkStub : public EdgeNetworkStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc index 1a9a602dc9514..8a15568c1b9e8 100644 --- a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc +++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultEdgeNetworkStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::edgenetwork::v1::EdgeNetwork::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub.cc b/google/cloud/eventarc/v1/internal/eventarc_stub.cc index 8203bd54f137e..620a8e0d06f47 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_stub.cc @@ -981,7 +981,7 @@ DefaultEventarcStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -998,7 +998,8 @@ future DefaultEventarcStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub.h b/google/cloud/eventarc/v1/internal/eventarc_stub.h index 5bc7a4fcd48b9..e1749f688a997 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub.h +++ b/google/cloud/eventarc/v1/internal/eventarc_stub.h @@ -414,18 +414,15 @@ class DefaultEventarcStub : public EventarcStub { DefaultEventarcStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetTrigger( grpc::ClientContext& context, Options const& options, @@ -812,12 +809,11 @@ class DefaultEventarcStub : public EventarcStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc b/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc index 28106cd5df679..65a39d991e077 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_stub_factory.cc @@ -47,14 +47,12 @@ std::shared_ptr CreateDefaultEventarcStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::eventarc::v1::Eventarc::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc index ba8835ac6757f..33d0d1e1008d8 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.cc @@ -517,7 +517,7 @@ DefaultCloudFilestoreManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -534,7 +534,8 @@ future DefaultCloudFilestoreManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h index 70e73a75391cc..001c05ae33e96 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub.h @@ -220,16 +220,13 @@ class DefaultCloudFilestoreManagerStub : public CloudFilestoreManagerStub { std::unique_ptr< google::cloud::filestore::v1::CloudFilestoreManager::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -429,11 +426,10 @@ class DefaultCloudFilestoreManagerStub : public CloudFilestoreManagerStub { std::unique_ptr< google::cloud::filestore::v1::CloudFilestoreManager::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc index 7922b84d017ca..aa34d6f270200 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_stub_factory.cc @@ -47,14 +47,11 @@ CreateDefaultCloudFilestoreManagerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::filestore::v1::CloudFilestoreManager::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub.cc b/google/cloud/functions/v1/internal/cloud_functions_stub.cc index a949543fb7c60..7651b9abc0cfa 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_stub.cc @@ -266,7 +266,7 @@ DefaultCloudFunctionsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -283,7 +283,8 @@ future DefaultCloudFunctionsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub.h b/google/cloud/functions/v1/internal/cloud_functions_stub.h index 65fdaeb2ab218..76f6e3c0917cb 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub.h +++ b/google/cloud/functions/v1/internal/cloud_functions_stub.h @@ -141,16 +141,13 @@ class DefaultCloudFunctionsServiceStub : public CloudFunctionsServiceStub { std::unique_ptr< google::cloud::functions::v1::CloudFunctionsService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListFunctions( grpc::ClientContext& context, Options const& options, @@ -254,11 +251,10 @@ class DefaultCloudFunctionsServiceStub : public CloudFunctionsServiceStub { std::unique_ptr< google::cloud::functions::v1::CloudFunctionsService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc b/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc index 77c8b34591eb7..325ff130ddb14 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_stub_factory.cc @@ -47,14 +47,11 @@ CreateDefaultCloudFunctionsServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::functions::v1::CloudFunctionsService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/functions/v2/internal/function_stub.cc b/google/cloud/functions/v2/internal/function_stub.cc index 85e7e6b780e3f..c8f6e47f536ec 100644 --- a/google/cloud/functions/v2/internal/function_stub.cc +++ b/google/cloud/functions/v2/internal/function_stub.cc @@ -265,7 +265,7 @@ DefaultFunctionServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -282,7 +282,8 @@ future DefaultFunctionServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/functions/v2/internal/function_stub.h b/google/cloud/functions/v2/internal/function_stub.h index 02b66418dbf0f..ec66b556d7fb2 100644 --- a/google/cloud/functions/v2/internal/function_stub.h +++ b/google/cloud/functions/v2/internal/function_stub.h @@ -141,18 +141,15 @@ class DefaultFunctionServiceStub : public FunctionServiceStub { std::unique_ptr< google::cloud::functions::v2::FunctionService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetFunction( grpc::ClientContext& context, Options const& options, @@ -255,12 +252,11 @@ class DefaultFunctionServiceStub : public FunctionServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/functions/v2/internal/function_stub_factory.cc b/google/cloud/functions/v2/internal/function_stub_factory.cc index 2e6ea41f45df2..46308b77b82ae 100644 --- a/google/cloud/functions/v2/internal/function_stub_factory.cc +++ b/google/cloud/functions/v2/internal/function_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultFunctionServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::functions::v2::FunctionService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc index 9d2a8ca0a663b..81dea31a886fa 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.cc @@ -666,7 +666,7 @@ DefaultBackupForGKEStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -683,7 +683,8 @@ future DefaultBackupForGKEStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h index 314809b3a4b5b..4ec5dadbb3c53 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub.h @@ -292,18 +292,15 @@ class DefaultBackupForGKEStub : public BackupForGKEStub { DefaultBackupForGKEStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateBackupPlan( google::cloud::CompletionQueue& cq, @@ -565,12 +562,11 @@ class DefaultBackupForGKEStub : public BackupForGKEStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc index 39bef09ce3bc0..8301ee879d929 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultBackupForGKEStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::gkebackup::v1::BackupForGKE::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/gkehub/v1/internal/gke_hub_stub.cc b/google/cloud/gkehub/v1/internal/gke_hub_stub.cc index 392a3a5180213..ba6daca946c4c 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_stub.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_stub.cc @@ -278,7 +278,7 @@ DefaultGkeHubStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -295,7 +295,8 @@ future DefaultGkeHubStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/gkehub/v1/internal/gke_hub_stub.h b/google/cloud/gkehub/v1/internal/gke_hub_stub.h index f129c91a97cf7..99e9e570b8986 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_stub.h +++ b/google/cloud/gkehub/v1/internal/gke_hub_stub.h @@ -144,8 +144,9 @@ class DefaultGkeHubStub : public GkeHubStub { std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListMemberships( grpc::ClientContext& context, Options const& options, @@ -250,7 +251,8 @@ class DefaultGkeHubStub : public GkeHubStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc index 2d8143840f966..feb606bddf18e 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.cc @@ -298,7 +298,7 @@ DefaultAttachedClustersStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -315,7 +315,8 @@ future DefaultAttachedClustersStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h index 4355434571947..6e6315dcf91d9 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub.h @@ -159,12 +159,9 @@ class DefaultAttachedClustersStub : public AttachedClustersStub { google::cloud::gkemulticloud::v1::AttachedClusters::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateAttachedCluster( google::cloud::CompletionQueue& cq, @@ -281,7 +278,6 @@ class DefaultAttachedClustersStub : public AttachedClustersStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc index 0e7b834491087..9c45b6608d7de 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAttachedClustersStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::gkemulticloud::v1::AttachedClusters::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc index 0dd2a3762d41e..4ec0aa0de4e4d 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.cc @@ -424,7 +424,7 @@ DefaultAwsClustersStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -441,7 +441,8 @@ future DefaultAwsClustersStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h index 864750c55168c..b4ab4c5e7fea6 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub.h @@ -219,12 +219,9 @@ class DefaultAwsClustersStub : public AwsClustersStub { google::cloud::gkemulticloud::v1::AwsClusters::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateAwsCluster( google::cloud::CompletionQueue& cq, @@ -396,7 +393,6 @@ class DefaultAwsClustersStub : public AwsClustersStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc index 72f73d933847c..4bdd085079315 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAwsClustersStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::gkemulticloud::v1::AwsClusters::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc index 417503980d85f..b822947551440 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.cc @@ -491,7 +491,7 @@ DefaultAzureClustersStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -508,7 +508,8 @@ future DefaultAzureClustersStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h index 0fb12baeb3ac1..dcff4271e4239 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub.h @@ -245,12 +245,9 @@ class DefaultAzureClustersStub : public AzureClustersStub { google::cloud::gkemulticloud::v1::AzureClusters::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateAzureClient( google::cloud::CompletionQueue& cq, @@ -446,7 +443,6 @@ class DefaultAzureClustersStub : public AzureClustersStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc index ae5fc16fc5c3b..4986128276710 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAzureClustersStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::gkemulticloud::v1::AzureClusters::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/iam/v2/internal/policies_stub.cc b/google/cloud/iam/v2/internal/policies_stub.cc index 9dd1fc16411ed..868fefa73c4da 100644 --- a/google/cloud/iam/v2/internal/policies_stub.cc +++ b/google/cloud/iam/v2/internal/policies_stub.cc @@ -162,7 +162,7 @@ DefaultPoliciesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -179,7 +179,8 @@ future DefaultPoliciesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/iam/v2/internal/policies_stub.h b/google/cloud/iam/v2/internal/policies_stub.h index 480003b9110f6..2d472fe15ddf5 100644 --- a/google/cloud/iam/v2/internal/policies_stub.h +++ b/google/cloud/iam/v2/internal/policies_stub.h @@ -98,12 +98,9 @@ class DefaultPoliciesStub : public PoliciesStub { DefaultPoliciesStub( std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListPolicies( grpc::ClientContext& context, Options const& options, @@ -163,7 +160,6 @@ class DefaultPoliciesStub : public PoliciesStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/iam/v2/internal/policies_stub_factory.cc b/google/cloud/iam/v2/internal/policies_stub_factory.cc index 9080d90641b7e..9c17295d5b073 100644 --- a/google/cloud/iam/v2/internal/policies_stub_factory.cc +++ b/google/cloud/iam/v2/internal/policies_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultPoliciesStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::iam::v2::Policies::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/ids/v1/internal/ids_stub.cc b/google/cloud/ids/v1/internal/ids_stub.cc index 1e5375ab319aa..d46d5cfb5bb1d 100644 --- a/google/cloud/ids/v1/internal/ids_stub.cc +++ b/google/cloud/ids/v1/internal/ids_stub.cc @@ -125,7 +125,7 @@ DefaultIDSStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -142,7 +142,8 @@ future DefaultIDSStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/ids/v1/internal/ids_stub.h b/google/cloud/ids/v1/internal/ids_stub.h index 8c4646fb3c522..b40f25e5a66a1 100644 --- a/google/cloud/ids/v1/internal/ids_stub.h +++ b/google/cloud/ids/v1/internal/ids_stub.h @@ -84,8 +84,9 @@ class DefaultIDSStub : public IDSStub { DefaultIDSStub( std::unique_ptr grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListEndpoints( grpc::ClientContext& context, Options const& options, @@ -129,7 +130,8 @@ class DefaultIDSStub : public IDSStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/autokey_stub.cc b/google/cloud/kms/v1/internal/autokey_stub.cc index 061a98c3bae53..3d56f0a7ce334 100644 --- a/google/cloud/kms/v1/internal/autokey_stub.cc +++ b/google/cloud/kms/v1/internal/autokey_stub.cc @@ -165,7 +165,7 @@ DefaultAutokeyStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -182,7 +182,8 @@ future DefaultAutokeyStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/kms/v1/internal/autokey_stub.h b/google/cloud/kms/v1/internal/autokey_stub.h index 8a8329ed3d20f..1835f5888a667 100644 --- a/google/cloud/kms/v1/internal/autokey_stub.h +++ b/google/cloud/kms/v1/internal/autokey_stub.h @@ -102,18 +102,15 @@ class DefaultAutokeyStub : public AutokeyStub { public: DefaultAutokeyStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateKeyHandle( google::cloud::CompletionQueue& cq, @@ -171,12 +168,11 @@ class DefaultAutokeyStub : public AutokeyStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/kms/v1/internal/autokey_stub_factory.cc b/google/cloud/kms/v1/internal/autokey_stub_factory.cc index 5be68fdc32071..910d17cc626da 100644 --- a/google/cloud/kms/v1/internal/autokey_stub_factory.cc +++ b/google/cloud/kms/v1/internal/autokey_stub_factory.cc @@ -46,14 +46,12 @@ std::shared_ptr CreateDefaultAutokeyStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::kms::v1::Autokey::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub.cc b/google/cloud/logging/v2/internal/config_service_v2_stub.cc index 79cd43342f2cf..dd297b2acadf0 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_stub.cc @@ -532,7 +532,7 @@ DefaultConfigServiceV2Stub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -549,7 +549,8 @@ future DefaultConfigServiceV2Stub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub.h b/google/cloud/logging/v2/internal/config_service_v2_stub.h index 68d22ad234195..764a24ac65353 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub.h +++ b/google/cloud/logging/v2/internal/config_service_v2_stub.h @@ -229,12 +229,9 @@ class DefaultConfigServiceV2Stub : public ConfigServiceV2Stub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListBuckets( grpc::ClientContext& context, Options const& options, @@ -423,7 +420,6 @@ class DefaultConfigServiceV2Stub : public ConfigServiceV2Stub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc b/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc index c94664e925f03..e7a98036aeef6 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultConfigServiceV2Stub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::logging::v2::ConfigServiceV2::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc b/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc index cf22b483d1c08..5dff8f9ba2eec 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_stub.cc @@ -304,7 +304,7 @@ DefaultManagedIdentitiesServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -321,7 +321,8 @@ future DefaultManagedIdentitiesServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_stub.h b/google/cloud/managedidentities/v1/internal/managed_identities_stub.h index 3257bd3aa1e03..bc9058c5242ff 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_stub.h +++ b/google/cloud/managedidentities/v1/internal/managed_identities_stub.h @@ -162,8 +162,9 @@ class DefaultManagedIdentitiesServiceStub ManagedIdentitiesService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateMicrosoftAdDomain( google::cloud::CompletionQueue& cq, @@ -281,7 +282,8 @@ class DefaultManagedIdentitiesServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc index 3312277891dbc..2bf03e115f4c9 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.cc @@ -335,7 +335,7 @@ DefaultManagedKafkaStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -352,7 +352,8 @@ future DefaultManagedKafkaStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h index 324e00b54db88..e40969dd2723f 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub.h @@ -166,16 +166,13 @@ class DefaultManagedKafkaStub : public ManagedKafkaStub { std::unique_ptr< google::cloud::managedkafka::v1::ManagedKafka::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListClusters( grpc::ClientContext& context, Options const& options, @@ -306,11 +303,10 @@ class DefaultManagedKafkaStub : public ManagedKafkaStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc b/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc index c4918776b3295..bd7033102a8e9 100644 --- a/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc +++ b/google/cloud/managedkafka/v1/internal/managed_kafka_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultManagedKafkaStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::managedkafka::v1::ManagedKafka::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc b/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc index 6069892c8869b..38c0a8f6848e6 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub.cc @@ -319,7 +319,7 @@ DefaultCloudMemcacheStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -336,7 +336,8 @@ future DefaultCloudMemcacheStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub.h b/google/cloud/memcache/v1/internal/cloud_memcache_stub.h index cf5ae005eaef8..07373332c0a18 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub.h +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub.h @@ -155,16 +155,13 @@ class DefaultCloudMemcacheStub : public CloudMemcacheStub { DefaultCloudMemcacheStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -286,11 +283,10 @@ class DefaultCloudMemcacheStub : public CloudMemcacheStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc b/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc index 95c5dbad8bde1..d6a4881ef1946 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultCloudMemcacheStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::memcache::v1::CloudMemcache::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc index 39d4ff561b6c6..b5a806633829b 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.cc @@ -268,7 +268,7 @@ DefaultDataprocMetastoreFederationStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -285,7 +285,8 @@ future DefaultDataprocMetastoreFederationStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h index 2deb95e08b7e0..fdf3ffc47578b 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub.h @@ -140,18 +140,15 @@ class DefaultDataprocMetastoreFederationStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListFederations(grpc::ClientContext& context, Options const& options, @@ -251,12 +248,11 @@ class DefaultDataprocMetastoreFederationStub std::unique_ptr< google::cloud::metastore::v1::DataprocMetastoreFederation::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc index 6fd8d9a0d5bc3..96314fb95d78c 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_stub_factory.cc @@ -49,15 +49,13 @@ CreateDefaultDataprocMetastoreFederationStub( auto service_grpc_stub = google::cloud::metastore::v1::DataprocMetastoreFederation::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc index 083e2a3769a6d..790c5e870066b 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.cc @@ -589,7 +589,7 @@ DefaultDataprocMetastoreStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -606,7 +606,8 @@ future DefaultDataprocMetastoreStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h index a816353c0008d..1a64c7e358547 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub.h @@ -260,18 +260,15 @@ class DefaultDataprocMetastoreStub : public DataprocMetastoreStub { std::unique_ptr< google::cloud::metastore::v1::DataprocMetastore::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListServices( grpc::ClientContext& context, Options const& options, @@ -498,12 +495,11 @@ class DefaultDataprocMetastoreStub : public DataprocMetastoreStub { std::unique_ptr< google::cloud::metastore::v1::DataprocMetastore::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc index b19d1a67e7b04..0d936b90275a0 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDataprocMetastoreStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::metastore::v1::DataprocMetastore::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc b/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc index cd1e5cf5bab64..74a34cd8ae463 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub.cc @@ -1161,7 +1161,7 @@ DefaultMigrationCenterStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1178,7 +1178,8 @@ future DefaultMigrationCenterStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub.h b/google/cloud/migrationcenter/v1/internal/migration_center_stub.h index 8b129e8869673..b6ca527489260 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub.h +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub.h @@ -507,16 +507,13 @@ class DefaultMigrationCenterStub : public MigrationCenterStub { std::unique_ptr< google::cloud::migrationcenter::v1::MigrationCenter::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListAssets( grpc::ClientContext& context, Options const& options, @@ -968,11 +965,10 @@ class DefaultMigrationCenterStub : public MigrationCenterStub { std::unique_ptr< google::cloud::migrationcenter::v1::MigrationCenter::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc b/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc index a58f273cf077a..413a3ab5cff32 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultMigrationCenterStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::migrationcenter::v1::MigrationCenter::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc index a879769109594..d9a6ec489bd0b 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.cc @@ -141,7 +141,7 @@ DefaultMetricsScopesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -158,7 +158,8 @@ future DefaultMetricsScopesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h index 22c1dfd75ad8c..a13f45f01d62f 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_stub.h @@ -97,8 +97,9 @@ class DefaultMetricsScopesStub : public MetricsScopesStub { google::monitoring::metricsscope::v1::MetricsScopes::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr GetMetricsScope( grpc::ClientContext& context, Options const& options, @@ -152,7 +153,8 @@ class DefaultMetricsScopesStub : public MetricsScopesStub { std::unique_ptr< google::monitoring::metricsscope::v1::MetricsScopes::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/netapp/v1/internal/net_app_stub.cc b/google/cloud/netapp/v1/internal/net_app_stub.cc index 188c7fc5b0c6c..b30f14ec12c98 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub.cc +++ b/google/cloud/netapp/v1/internal/net_app_stub.cc @@ -1312,7 +1312,7 @@ DefaultNetAppStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1329,7 +1329,8 @@ future DefaultNetAppStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/netapp/v1/internal/net_app_stub.h b/google/cloud/netapp/v1/internal/net_app_stub.h index 89ae43daf71f3..147f8332e3c5e 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub.h +++ b/google/cloud/netapp/v1/internal/net_app_stub.h @@ -526,16 +526,13 @@ class DefaultNetAppStub : public NetAppStub { DefaultNetAppStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListStoragePools(grpc::ClientContext& context, Options const& options, @@ -1035,11 +1032,10 @@ class DefaultNetAppStub : public NetAppStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/netapp/v1/internal/net_app_stub_factory.cc b/google/cloud/netapp/v1/internal/net_app_stub_factory.cc index 3ffe3c4c942a6..5286c3fb763b6 100644 --- a/google/cloud/netapp/v1/internal/net_app_stub_factory.cc +++ b/google/cloud/netapp/v1/internal/net_app_stub_factory.cc @@ -45,13 +45,10 @@ std::shared_ptr CreateDefaultNetAppStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::netapp::v1::NetApp::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub.cc b/google/cloud/networkconnectivity/v1/internal/hub_stub.cc index 67cf18c2987c3..2b90688b9b652 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub.cc @@ -528,7 +528,7 @@ DefaultHubServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -545,7 +545,8 @@ future DefaultHubServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub.h b/google/cloud/networkconnectivity/v1/internal/hub_stub.h index 5c1015af648db..b887014ff4652 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub.h @@ -253,18 +253,15 @@ class DefaultHubServiceStub : public HubServiceStub { std::unique_ptr< google::cloud::networkconnectivity::v1::HubService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListHubs( grpc::ClientContext& context, Options const& options, @@ -471,12 +468,11 @@ class DefaultHubServiceStub : public HubServiceStub { std::unique_ptr< google::cloud::networkconnectivity::v1::HubService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc b/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc index e17f813f78959..f7c3f9c3e51de 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultHubServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::networkconnectivity::v1::HubService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc index 42d0a886897fe..8bb4cc2f8de77 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.cc @@ -246,7 +246,7 @@ DefaultPolicyBasedRoutingServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -263,7 +263,8 @@ future DefaultPolicyBasedRoutingServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h index d2b0f6fed3075..9fbe2bc1cf724 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub.h @@ -136,18 +136,15 @@ class DefaultPolicyBasedRoutingServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::networkconnectivity::v1::ListPolicyBasedRoutesResponse> @@ -238,12 +235,11 @@ class DefaultPolicyBasedRoutingServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc index f57e2a7efa225..122fea418d456 100644 --- a/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc +++ b/google/cloud/networkconnectivity/v1/internal/policy_based_routing_stub_factory.cc @@ -48,15 +48,13 @@ CreateDefaultPolicyBasedRoutingServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::networkconnectivity::v1:: PolicyBasedRoutingService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub.cc b/google/cloud/networkmanagement/v1/internal/reachability_stub.cc index 25cffb8de0eff..6bfbeda436194 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub.cc @@ -310,7 +310,7 @@ DefaultReachabilityServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -327,7 +327,8 @@ future DefaultReachabilityServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub.h b/google/cloud/networkmanagement/v1/internal/reachability_stub.h index b00ea03039e97..5f29667c5290e 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub.h +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub.h @@ -162,18 +162,15 @@ class DefaultReachabilityServiceStub : public ReachabilityServiceStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListConnectivityTests( @@ -287,12 +284,11 @@ class DefaultReachabilityServiceStub : public ReachabilityServiceStub { std::unique_ptr< google::cloud::networkmanagement::v1::ReachabilityService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc b/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc index 53146d8ac1a1d..554f5998fb9b7 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_stub_factory.cc @@ -48,15 +48,13 @@ std::shared_ptr CreateDefaultReachabilityServiceStub( auto service_grpc_stub = google::cloud::networkmanagement::v1::ReachabilityService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub.cc b/google/cloud/networksecurity/v1/internal/network_security_stub.cc index f9038b7868267..77555bdf82f59 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_stub.cc @@ -530,7 +530,7 @@ DefaultNetworkSecurityStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -547,7 +547,8 @@ future DefaultNetworkSecurityStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub.h b/google/cloud/networksecurity/v1/internal/network_security_stub.h index 6abc7d83f760a..a958f1110d9c0 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub.h +++ b/google/cloud/networksecurity/v1/internal/network_security_stub.h @@ -254,18 +254,15 @@ class DefaultNetworkSecurityStub : public NetworkSecurityStub { std::unique_ptr< google::cloud::networksecurity::v1::NetworkSecurity::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::networksecurity::v1::ListAuthorizationPoliciesResponse> @@ -467,12 +464,11 @@ class DefaultNetworkSecurityStub : public NetworkSecurityStub { std::unique_ptr< google::cloud::networksecurity::v1::NetworkSecurity::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc b/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc index 98ff9993bcf4a..8e42fca7d8861 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultNetworkSecurityStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::networksecurity::v1::NetworkSecurity::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networkservices/v1/internal/dep_stub.cc b/google/cloud/networkservices/v1/internal/dep_stub.cc index 8e299b3fb3e06..4bfb65bb57b60 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub.cc +++ b/google/cloud/networkservices/v1/internal/dep_stub.cc @@ -404,7 +404,7 @@ DefaultDepServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -421,7 +421,8 @@ future DefaultDepServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networkservices/v1/internal/dep_stub.h b/google/cloud/networkservices/v1/internal/dep_stub.h index 00dcb058330d2..919da838e7516 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub.h +++ b/google/cloud/networkservices/v1/internal/dep_stub.h @@ -201,18 +201,15 @@ class DefaultDepServiceStub : public DepServiceStub { std::unique_ptr< google::cloud::networkservices::v1::DepService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListLbTrafficExtensions( @@ -364,12 +361,11 @@ class DefaultDepServiceStub : public DepServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkservices/v1/internal/dep_stub_factory.cc b/google/cloud/networkservices/v1/internal/dep_stub_factory.cc index 7d81cf80d0340..4e919a379e61e 100644 --- a/google/cloud/networkservices/v1/internal/dep_stub_factory.cc +++ b/google/cloud/networkservices/v1/internal/dep_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultDepServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::networkservices::v1::DepService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/networkservices/v1/internal/network_services_stub.cc b/google/cloud/networkservices/v1/internal/network_services_stub.cc index 5d5e9fbdc7b67..a923eb17649b6 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub.cc +++ b/google/cloud/networkservices/v1/internal/network_services_stub.cc @@ -1070,7 +1070,7 @@ DefaultNetworkServicesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1087,7 +1087,8 @@ future DefaultNetworkServicesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/networkservices/v1/internal/network_services_stub.h b/google/cloud/networkservices/v1/internal/network_services_stub.h index abcce63a94a9b..dc4294c025fb5 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub.h +++ b/google/cloud/networkservices/v1/internal/network_services_stub.h @@ -458,18 +458,15 @@ class DefaultNetworkServicesStub : public NetworkServicesStub { std::unique_ptr< google::cloud::networkservices::v1::NetworkServices::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListEndpointPolicies( @@ -885,12 +882,11 @@ class DefaultNetworkServicesStub : public NetworkServicesStub { std::unique_ptr< google::cloud::networkservices::v1::NetworkServices::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc b/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc index 7e12033078794..900f9828b73cd 100644 --- a/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc +++ b/google/cloud/networkservices/v1/internal/network_services_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultNetworkServicesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::networkservices::v1::NetworkServices::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc b/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc index b288006f6f989..e473ecbc92f22 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub.cc @@ -491,7 +491,7 @@ DefaultManagedNotebookServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -508,7 +508,8 @@ future DefaultManagedNotebookServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub.h b/google/cloud/notebooks/v1/internal/managed_notebook_stub.h index 98a0738ed65f1..a98bcc7f14043 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub.h +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub.h @@ -217,18 +217,15 @@ class DefaultManagedNotebookServiceStub : public ManagedNotebookServiceStub { std::unique_ptr< google::cloud::notebooks::v1::ManagedNotebookService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListRuntimes( grpc::ClientContext& context, Options const& options, @@ -415,12 +412,11 @@ class DefaultManagedNotebookServiceStub : public ManagedNotebookServiceStub { std::unique_ptr< google::cloud::notebooks::v1::ManagedNotebookService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc b/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc index 6de06de822f99..1c0604fc72f8d 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_stub_factory.cc @@ -48,15 +48,13 @@ CreateDefaultManagedNotebookServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::notebooks::v1::ManagedNotebookService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/notebooks/v1/internal/notebook_stub.cc b/google/cloud/notebooks/v1/internal/notebook_stub.cc index 9010d41704d4f..eb80157d20d38 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub.cc +++ b/google/cloud/notebooks/v1/internal/notebook_stub.cc @@ -1002,7 +1002,7 @@ DefaultNotebookServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1019,7 +1019,8 @@ future DefaultNotebookServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/notebooks/v1/internal/notebook_stub.h b/google/cloud/notebooks/v1/internal/notebook_stub.h index 307431f687679..da6aa06364115 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub.h +++ b/google/cloud/notebooks/v1/internal/notebook_stub.h @@ -413,18 +413,15 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { std::unique_ptr< google::cloud::notebooks::v1::NotebookService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -810,12 +807,11 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc b/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc index e578331d78ffd..03e413caae60e 100644 --- a/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc +++ b/google/cloud/notebooks/v1/internal/notebook_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultNotebookServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::notebooks::v1::NotebookService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/notebooks/v2/internal/notebook_stub.cc b/google/cloud/notebooks/v2/internal/notebook_stub.cc index 4dc3541fa02a2..28e67e0ae555d 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub.cc +++ b/google/cloud/notebooks/v2/internal/notebook_stub.cc @@ -460,7 +460,7 @@ DefaultNotebookServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -477,7 +477,8 @@ future DefaultNotebookServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/notebooks/v2/internal/notebook_stub.h b/google/cloud/notebooks/v2/internal/notebook_stub.h index fa5b8c46249fe..704d2a52c1684 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub.h +++ b/google/cloud/notebooks/v2/internal/notebook_stub.h @@ -205,18 +205,15 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { std::unique_ptr< google::cloud::notebooks::v2::NotebookService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -392,12 +389,11 @@ class DefaultNotebookServiceStub : public NotebookServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc b/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc index 35a18b2ffaada..27da3d3f19bd1 100644 --- a/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc +++ b/google/cloud/notebooks/v2/internal/notebook_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultNotebookServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::notebooks::v2::NotebookService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub.cc b/google/cloud/optimization/v1/internal/fleet_routing_stub.cc index bd93cd9f8547b..3bfd0d174006e 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub.cc @@ -98,7 +98,7 @@ DefaultFleetRoutingStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -115,7 +115,8 @@ future DefaultFleetRoutingStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub.h b/google/cloud/optimization/v1/internal/fleet_routing_stub.h index 3b06ba3f70fb6..d0971aa7b2a11 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub.h +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub.h @@ -80,12 +80,9 @@ class DefaultFleetRoutingStub : public FleetRoutingStub { google::cloud::optimization::v1::FleetRouting::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr OptimizeTours(grpc::ClientContext& context, Options const& options, @@ -125,7 +122,6 @@ class DefaultFleetRoutingStub : public FleetRoutingStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc b/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc index 64b2459eb70c6..cbe797b6aae3f 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultFleetRoutingStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::optimization::v1::FleetRouting::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc index e581e6b7708df..741676222f571 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.cc @@ -265,7 +265,7 @@ DefaultOsConfigZonalServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -282,7 +282,8 @@ future DefaultOsConfigZonalServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h index b4eeb7206674d..66f2c896423dd 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_stub.h @@ -151,8 +151,9 @@ class DefaultOsConfigZonalServiceStub : public OsConfigZonalServiceStub { google::cloud::osconfig::v1::OsConfigZonalService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateOSPolicyAssignment( @@ -260,7 +261,8 @@ class DefaultOsConfigZonalServiceStub : public OsConfigZonalServiceStub { std::unique_ptr< google::cloud::osconfig::v1::OsConfigZonalService::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc b/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc index 717ef8272406a..25fa1b96592bb 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub.cc @@ -288,7 +288,7 @@ DefaultParallelstoreStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -305,7 +305,8 @@ future DefaultParallelstoreStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub.h b/google/cloud/parallelstore/v1/internal/parallelstore_stub.h index 7fac500a8c8c3..9a2c1b963d810 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub.h +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub.h @@ -148,16 +148,13 @@ class DefaultParallelstoreStub : public ParallelstoreStub { std::unique_ptr< google::cloud::parallelstore::v1::Parallelstore::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances(grpc::ClientContext& context, Options const& options, @@ -269,11 +266,10 @@ class DefaultParallelstoreStub : public ParallelstoreStub { std::unique_ptr< google::cloud::parallelstore::v1::Parallelstore::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc b/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc index a3323056e221a..bbbd5d900fa7b 100644 --- a/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc +++ b/google/cloud/parallelstore/v1/internal/parallelstore_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultParallelstoreStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::parallelstore::v1::Parallelstore::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub.cc b/google/cloud/policysimulator/v1/internal/simulator_stub.cc index ab9d2abacad65..fee7824a6dad2 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_stub.cc @@ -122,7 +122,7 @@ DefaultSimulatorStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -139,7 +139,8 @@ future DefaultSimulatorStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub.h b/google/cloud/policysimulator/v1/internal/simulator_stub.h index c18e6502745bc..347ddd18739f3 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub.h +++ b/google/cloud/policysimulator/v1/internal/simulator_stub.h @@ -89,12 +89,9 @@ class DefaultSimulatorStub : public SimulatorStub { google::cloud::policysimulator::v1::Simulator::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetReplay( grpc::ClientContext& context, Options const& options, @@ -144,7 +141,6 @@ class DefaultSimulatorStub : public SimulatorStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc b/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc index 099b146b057ba..dedaa069c5f4a 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultSimulatorStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::policysimulator::v1::Simulator::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub.cc b/google/cloud/privateca/v1/internal/certificate_authority_stub.cc index a8296f1f4706e..031ecf7f19179 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub.cc @@ -840,7 +840,7 @@ DefaultCertificateAuthorityServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -857,7 +857,8 @@ future DefaultCertificateAuthorityServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub.h b/google/cloud/privateca/v1/internal/certificate_authority_stub.h index 98ef17470e1e3..0534b8d544347 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub.h +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub.h @@ -371,18 +371,15 @@ class DefaultCertificateAuthorityServiceStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateCertificate( @@ -706,12 +703,11 @@ class DefaultCertificateAuthorityServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc b/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc index ea0bfdc9f919b..fa19f151038ef 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_stub_factory.cc @@ -48,15 +48,13 @@ CreateDefaultCertificateAuthorityServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::security::privateca::v1:: CertificateAuthorityService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc index 96d3ac78241b1..2c5cc608e4ab2 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.cc @@ -369,7 +369,7 @@ DefaultPrivilegedAccessManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -386,7 +386,8 @@ future DefaultPrivilegedAccessManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h index ffe8082e89ddd..e55f83bbec289 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub.h @@ -188,16 +188,13 @@ class DefaultPrivilegedAccessManagerStub : public PrivilegedAccessManagerStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::privilegedaccessmanager::v1::CheckOnboardingStatusResponse> @@ -340,11 +337,10 @@ class DefaultPrivilegedAccessManagerStub : public PrivilegedAccessManagerStub { std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc index e31a4db7aadbf..d91388269d307 100644 --- a/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc +++ b/google/cloud/privilegedaccessmanager/v1/internal/privileged_access_manager_stub_factory.cc @@ -47,14 +47,11 @@ CreateDefaultPrivilegedAccessManagerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::privilegedaccessmanager::v1:: PrivilegedAccessManager::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/pubsublite/internal/admin_stub.cc b/google/cloud/pubsublite/internal/admin_stub.cc index 57de2b64b7ca7..f7b4708f0e75a 100644 --- a/google/cloud/pubsublite/internal/admin_stub.cc +++ b/google/cloud/pubsublite/internal/admin_stub.cc @@ -356,7 +356,7 @@ DefaultAdminServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -373,7 +373,8 @@ future DefaultAdminServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/pubsublite/internal/admin_stub.h b/google/cloud/pubsublite/internal/admin_stub.h index f8e3aa9070a5c..ffeeb74b5ace6 100644 --- a/google/cloud/pubsublite/internal/admin_stub.h +++ b/google/cloud/pubsublite/internal/admin_stub.h @@ -188,12 +188,9 @@ class DefaultAdminServiceStub : public AdminServiceStub { google::cloud::pubsublite::v1::AdminService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateTopic( grpc::ClientContext& context, Options const& options, @@ -338,7 +335,6 @@ class DefaultAdminServiceStub : public AdminServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/pubsublite/internal/admin_stub_factory.cc b/google/cloud/pubsublite/internal/admin_stub_factory.cc index e86c06a1a4aa2..00a3ff41c4620 100644 --- a/google/cloud/pubsublite/internal/admin_stub_factory.cc +++ b/google/cloud/pubsublite/internal/admin_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAdminServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::pubsublite::v1::AdminService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc index b6de00fedd471..c68db5657494e 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.cc @@ -385,7 +385,7 @@ DefaultRapidMigrationAssessmentStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -402,7 +402,8 @@ future DefaultRapidMigrationAssessmentStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h index 2cb649887f0be..63908d1d969a7 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub.h @@ -188,16 +188,13 @@ class DefaultRapidMigrationAssessmentStub std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateCollector( google::cloud::CompletionQueue& cq, @@ -340,11 +337,10 @@ class DefaultRapidMigrationAssessmentStub std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc index fcfe3b24cd5e9..414e9038db512 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_stub_factory.cc @@ -48,14 +48,11 @@ CreateDefaultRapidMigrationAssessmentStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::rapidmigrationassessment::v1:: RapidMigrationAssessment::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc index baa06b7d22bb8..492016d290f7a 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.cc @@ -245,7 +245,7 @@ DefaultCloudRedisClusterStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -262,7 +262,8 @@ future DefaultCloudRedisClusterStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h index 4a81adeaa24fd..89330bea99231 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub.h @@ -134,16 +134,13 @@ class DefaultCloudRedisClusterStub : public CloudRedisClusterStub { std::unique_ptr< google::cloud::redis::cluster::v1::CloudRedisCluster::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListClusters(grpc::ClientContext& context, Options const& options, @@ -237,11 +234,10 @@ class DefaultCloudRedisClusterStub : public CloudRedisClusterStub { std::unique_ptr< google::cloud::redis::cluster::v1::CloudRedisCluster::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc index 09fc45278f378..462dd914a7ff4 100644 --- a/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc +++ b/google/cloud/redis/cluster/v1/internal/cloud_redis_cluster_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultCloudRedisClusterStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::redis::cluster::v1::CloudRedisCluster::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub.cc b/google/cloud/redis/v1/internal/cloud_redis_stub.cc index 13d74612c0cae..39cac7c9226d4 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_stub.cc @@ -382,7 +382,7 @@ DefaultCloudRedisStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -399,7 +399,8 @@ future DefaultCloudRedisStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub.h b/google/cloud/redis/v1/internal/cloud_redis_stub.h index b2193dd08b097..4351f890bc08a 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub.h +++ b/google/cloud/redis/v1/internal/cloud_redis_stub.h @@ -181,16 +181,13 @@ class DefaultCloudRedisStub : public CloudRedisStub { DefaultCloudRedisStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( grpc::ClientContext& context, Options const& options, @@ -328,11 +325,10 @@ class DefaultCloudRedisStub : public CloudRedisStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc b/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc index 6989fb66f18e0..8bce0fd9b72c3 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultCloudRedisStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::redis::v1::CloudRedis::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub.cc b/google/cloud/resourcemanager/v3/internal/folders_stub.cc index bd7f7cd2b381d..e5ce59e3e02b7 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_stub.cc @@ -275,7 +275,7 @@ DefaultFoldersStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -292,7 +292,8 @@ future DefaultFoldersStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub.h b/google/cloud/resourcemanager/v3/internal/folders_stub.h index 55a17bb652052..c06951c64cdfa 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub.h +++ b/google/cloud/resourcemanager/v3/internal/folders_stub.h @@ -147,12 +147,9 @@ class DefaultFoldersStub : public FoldersStub { google::cloud::resourcemanager::v3::Folders::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetFolder( grpc::ClientContext& context, Options const& options, @@ -262,7 +259,6 @@ class DefaultFoldersStub : public FoldersStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc index 9e222d6492f3c..cda814a4582fc 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultFoldersStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::Folders::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub.cc b/google/cloud/resourcemanager/v3/internal/projects_stub.cc index 1aa054221fe68..de86e7e7e1692 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_stub.cc @@ -275,7 +275,7 @@ DefaultProjectsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -292,7 +292,8 @@ future DefaultProjectsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub.h b/google/cloud/resourcemanager/v3/internal/projects_stub.h index 2956cd2a2524c..2c0c04dc43ba2 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub.h +++ b/google/cloud/resourcemanager/v3/internal/projects_stub.h @@ -150,12 +150,9 @@ class DefaultProjectsStub : public ProjectsStub { google::cloud::resourcemanager::v3::Projects::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetProject( grpc::ClientContext& context, Options const& options, @@ -266,7 +263,6 @@ class DefaultProjectsStub : public ProjectsStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc index 9b366510f879c..e3a2079753c1f 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultProjectsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::Projects::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc index 402711a691d8d..f93a2fc8fd63a 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.cc @@ -146,7 +146,7 @@ DefaultTagBindingsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -163,7 +163,8 @@ future DefaultTagBindingsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h index 8766c7ec8d19b..74a8a9aee2c11 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub.h @@ -101,12 +101,9 @@ class DefaultTagBindingsStub : public TagBindingsStub { google::cloud::resourcemanager::v3::TagBindings::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListTagBindings( @@ -166,7 +163,6 @@ class DefaultTagBindingsStub : public TagBindingsStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc index 809540cbb399e..d8eb627229b98 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultTagBindingsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::TagBindings::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc index c45cc8d2b8fd7..e737b5b1aa48c 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.cc @@ -127,7 +127,7 @@ DefaultTagHoldsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -144,7 +144,8 @@ future DefaultTagHoldsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h index b88df7f766ea4..e95286d3fc407 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub.h @@ -91,12 +91,9 @@ class DefaultTagHoldsStub : public TagHoldsStub { google::cloud::resourcemanager::v3::TagHolds::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateTagHold( google::cloud::CompletionQueue& cq, @@ -148,7 +145,6 @@ class DefaultTagHoldsStub : public TagHoldsStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc index 6089bb92d87d4..e337c837a09e8 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultTagHoldsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::TagHolds::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc index c5c84b3093761..7d5c5340e4dc7 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.cc @@ -216,7 +216,7 @@ DefaultTagKeysStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -233,7 +233,8 @@ future DefaultTagKeysStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h index bb43d4517f566..550cb7d3ad372 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub.h @@ -126,12 +126,9 @@ class DefaultTagKeysStub : public TagKeysStub { google::cloud::resourcemanager::v3::TagKeys::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListTagKeys( grpc::ClientContext& context, Options const& options, @@ -217,7 +214,6 @@ class DefaultTagKeysStub : public TagKeysStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc index 3bf6576f2eaa4..68a9d77e2306c 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultTagKeysStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::TagKeys::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc index e56b3520a1bea..0c4f284bb2ede 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub.cc @@ -216,7 +216,7 @@ DefaultTagValuesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -233,7 +233,8 @@ future DefaultTagValuesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub.h b/google/cloud/resourcemanager/v3/internal/tag_values_stub.h index 6b7b77197b922..13c978c154085 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub.h +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub.h @@ -127,12 +127,9 @@ class DefaultTagValuesStub : public TagValuesStub { google::cloud::resourcemanager::v3::TagValues::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListTagValues(grpc::ClientContext& context, Options const& options, @@ -218,7 +215,6 @@ class DefaultTagValuesStub : public TagValuesStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc b/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc index 076f12b4d5941..59d039c5d16ab 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_stub_factory.cc @@ -45,10 +45,8 @@ std::shared_ptr CreateDefaultTagValuesStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::resourcemanager::v3::TagValues::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/retail/v2/internal/analytics_stub.cc b/google/cloud/retail/v2/internal/analytics_stub.cc index 164127c027812..ad221c04ccd5a 100644 --- a/google/cloud/retail/v2/internal/analytics_stub.cc +++ b/google/cloud/retail/v2/internal/analytics_stub.cc @@ -100,7 +100,7 @@ DefaultAnalyticsServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -117,7 +117,8 @@ future DefaultAnalyticsServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/retail/v2/internal/analytics_stub.h b/google/cloud/retail/v2/internal/analytics_stub.h index 43b9817fcd708..bec22474520f2 100644 --- a/google/cloud/retail/v2/internal/analytics_stub.h +++ b/google/cloud/retail/v2/internal/analytics_stub.h @@ -79,12 +79,9 @@ class DefaultAnalyticsServiceStub : public AnalyticsServiceStub { google::cloud::retail::v2::AnalyticsService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncExportAnalyticsMetrics( google::cloud::CompletionQueue& cq, @@ -123,7 +120,6 @@ class DefaultAnalyticsServiceStub : public AnalyticsServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/analytics_stub_factory.cc b/google/cloud/retail/v2/internal/analytics_stub_factory.cc index 62dbb849e24ae..46354fa94cbc8 100644 --- a/google/cloud/retail/v2/internal/analytics_stub_factory.cc +++ b/google/cloud/retail/v2/internal/analytics_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultAnalyticsServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::retail::v2::AnalyticsService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/retail/v2/internal/completion_stub.cc b/google/cloud/retail/v2/internal/completion_stub.cc index 6e02d44eccc5d..1c93d2158a306 100644 --- a/google/cloud/retail/v2/internal/completion_stub.cc +++ b/google/cloud/retail/v2/internal/completion_stub.cc @@ -111,7 +111,7 @@ DefaultCompletionServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -128,7 +128,8 @@ future DefaultCompletionServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/retail/v2/internal/completion_stub.h b/google/cloud/retail/v2/internal/completion_stub.h index 43081666af0c1..2bbe8b5154e5b 100644 --- a/google/cloud/retail/v2/internal/completion_stub.h +++ b/google/cloud/retail/v2/internal/completion_stub.h @@ -84,12 +84,9 @@ class DefaultCompletionServiceStub : public CompletionServiceStub { google::cloud::retail::v2::CompletionService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CompleteQuery( grpc::ClientContext& context, Options const& options, @@ -132,7 +129,6 @@ class DefaultCompletionServiceStub : public CompletionServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/completion_stub_factory.cc b/google/cloud/retail/v2/internal/completion_stub_factory.cc index 02495300a4cdf..a65a9e7536cad 100644 --- a/google/cloud/retail/v2/internal/completion_stub_factory.cc +++ b/google/cloud/retail/v2/internal/completion_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultCompletionServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::retail::v2::CompletionService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/retail/v2/internal/model_stub.cc b/google/cloud/retail/v2/internal/model_stub.cc index 207249a34f8a1..2c792f905021e 100644 --- a/google/cloud/retail/v2/internal/model_stub.cc +++ b/google/cloud/retail/v2/internal/model_stub.cc @@ -191,7 +191,7 @@ DefaultModelServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -208,7 +208,8 @@ future DefaultModelServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/retail/v2/internal/model_stub.h b/google/cloud/retail/v2/internal/model_stub.h index a1c45fac7255d..4718136ac438a 100644 --- a/google/cloud/retail/v2/internal/model_stub.h +++ b/google/cloud/retail/v2/internal/model_stub.h @@ -109,12 +109,9 @@ class DefaultModelServiceStub : public ModelServiceStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateModel( google::cloud::CompletionQueue& cq, @@ -185,7 +182,6 @@ class DefaultModelServiceStub : public ModelServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/model_stub_factory.cc b/google/cloud/retail/v2/internal/model_stub_factory.cc index ffdbff3b66a72..95d342bcdec3a 100644 --- a/google/cloud/retail/v2/internal/model_stub_factory.cc +++ b/google/cloud/retail/v2/internal/model_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultModelServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::retail::v2::ModelService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/retail/v2/internal/product_stub.cc b/google/cloud/retail/v2/internal/product_stub.cc index 1d0e6534530b6..6d98dc6203d28 100644 --- a/google/cloud/retail/v2/internal/product_stub.cc +++ b/google/cloud/retail/v2/internal/product_stub.cc @@ -343,7 +343,7 @@ DefaultProductServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -360,7 +360,8 @@ future DefaultProductServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/retail/v2/internal/product_stub.h b/google/cloud/retail/v2/internal/product_stub.h index a3ba4fdea13d7..3baf3d96d9d06 100644 --- a/google/cloud/retail/v2/internal/product_stub.h +++ b/google/cloud/retail/v2/internal/product_stub.h @@ -166,12 +166,9 @@ class DefaultProductServiceStub : public ProductServiceStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateProduct( grpc::ClientContext& context, Options const& options, @@ -296,7 +293,6 @@ class DefaultProductServiceStub : public ProductServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/product_stub_factory.cc b/google/cloud/retail/v2/internal/product_stub_factory.cc index c21e8ddfcf9c1..78445c5333601 100644 --- a/google/cloud/retail/v2/internal/product_stub_factory.cc +++ b/google/cloud/retail/v2/internal/product_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultProductServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::retail::v2::ProductService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/retail/v2/internal/user_event_stub.cc b/google/cloud/retail/v2/internal/user_event_stub.cc index 7416a3160caa1..9f337302135bc 100644 --- a/google/cloud/retail/v2/internal/user_event_stub.cc +++ b/google/cloud/retail/v2/internal/user_event_stub.cc @@ -181,7 +181,7 @@ DefaultUserEventServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -198,7 +198,8 @@ future DefaultUserEventServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/retail/v2/internal/user_event_stub.h b/google/cloud/retail/v2/internal/user_event_stub.h index 3475df81f58d0..5b299ec6f91b1 100644 --- a/google/cloud/retail/v2/internal/user_event_stub.h +++ b/google/cloud/retail/v2/internal/user_event_stub.h @@ -106,12 +106,9 @@ class DefaultUserEventServiceStub : public UserEventServiceStub { google::cloud::retail::v2::UserEventService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr WriteUserEvent( grpc::ClientContext& context, Options const& options, @@ -183,7 +180,6 @@ class DefaultUserEventServiceStub : public UserEventServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/retail/v2/internal/user_event_stub_factory.cc b/google/cloud/retail/v2/internal/user_event_stub_factory.cc index baa8de7cc6f0f..dd1f9b5329d46 100644 --- a/google/cloud/retail/v2/internal/user_event_stub_factory.cc +++ b/google/cloud/retail/v2/internal/user_event_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultUserEventServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::retail::v2::UserEventService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/run/v2/internal/executions_stub.cc b/google/cloud/run/v2/internal/executions_stub.cc index e99a662b66dda..2e8f50368a26c 100644 --- a/google/cloud/run/v2/internal/executions_stub.cc +++ b/google/cloud/run/v2/internal/executions_stub.cc @@ -170,7 +170,7 @@ DefaultExecutionsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -187,7 +187,8 @@ future DefaultExecutionsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/run/v2/internal/executions_stub.h b/google/cloud/run/v2/internal/executions_stub.h index d70c5a43d19df..1a3b61dc664c4 100644 --- a/google/cloud/run/v2/internal/executions_stub.h +++ b/google/cloud/run/v2/internal/executions_stub.h @@ -103,12 +103,9 @@ class DefaultExecutionsStub : public ExecutionsStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetExecution( grpc::ClientContext& context, Options const& options, @@ -170,7 +167,6 @@ class DefaultExecutionsStub : public ExecutionsStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/executions_stub_factory.cc b/google/cloud/run/v2/internal/executions_stub_factory.cc index 33db1205139cb..41d12c225b3c3 100644 --- a/google/cloud/run/v2/internal/executions_stub_factory.cc +++ b/google/cloud/run/v2/internal/executions_stub_factory.cc @@ -44,11 +44,9 @@ std::shared_ptr CreateDefaultExecutionsStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::run::v2::Executions::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/run/v2/internal/jobs_stub.cc b/google/cloud/run/v2/internal/jobs_stub.cc index cab9c3a8ed1fe..be653ab342910 100644 --- a/google/cloud/run/v2/internal/jobs_stub.cc +++ b/google/cloud/run/v2/internal/jobs_stub.cc @@ -256,7 +256,7 @@ DefaultJobsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -273,7 +273,8 @@ future DefaultJobsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/run/v2/internal/jobs_stub.h b/google/cloud/run/v2/internal/jobs_stub.h index 5644b4f75fe4c..1f4a6aaf4b18c 100644 --- a/google/cloud/run/v2/internal/jobs_stub.h +++ b/google/cloud/run/v2/internal/jobs_stub.h @@ -134,12 +134,9 @@ class DefaultJobsStub : public JobsStub { DefaultJobsStub( std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateJob( google::cloud::CompletionQueue& cq, @@ -233,7 +230,6 @@ class DefaultJobsStub : public JobsStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/jobs_stub_factory.cc b/google/cloud/run/v2/internal/jobs_stub_factory.cc index d1e964185b054..25ce80b2fa001 100644 --- a/google/cloud/run/v2/internal/jobs_stub_factory.cc +++ b/google/cloud/run/v2/internal/jobs_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultJobsStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::run::v2::Jobs::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/run/v2/internal/revisions_stub.cc b/google/cloud/run/v2/internal/revisions_stub.cc index e74acc9bc9fa6..c7e1f2068adf3 100644 --- a/google/cloud/run/v2/internal/revisions_stub.cc +++ b/google/cloud/run/v2/internal/revisions_stub.cc @@ -141,7 +141,7 @@ DefaultRevisionsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -158,7 +158,8 @@ future DefaultRevisionsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/run/v2/internal/revisions_stub.h b/google/cloud/run/v2/internal/revisions_stub.h index 2aedd4163a96d..3b55004d96000 100644 --- a/google/cloud/run/v2/internal/revisions_stub.h +++ b/google/cloud/run/v2/internal/revisions_stub.h @@ -91,12 +91,9 @@ class DefaultRevisionsStub : public RevisionsStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetRevision( grpc::ClientContext& context, Options const& options, @@ -148,7 +145,6 @@ class DefaultRevisionsStub : public RevisionsStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/revisions_stub_factory.cc b/google/cloud/run/v2/internal/revisions_stub_factory.cc index 4051c502b3dc4..d60184965d83a 100644 --- a/google/cloud/run/v2/internal/revisions_stub_factory.cc +++ b/google/cloud/run/v2/internal/revisions_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultRevisionsStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::run::v2::Revisions::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/run/v2/internal/services_stub.cc b/google/cloud/run/v2/internal/services_stub.cc index 11ab8eccb7992..0b1a81abce56b 100644 --- a/google/cloud/run/v2/internal/services_stub.cc +++ b/google/cloud/run/v2/internal/services_stub.cc @@ -233,7 +233,7 @@ DefaultServicesStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -250,7 +250,8 @@ future DefaultServicesStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/run/v2/internal/services_stub.h b/google/cloud/run/v2/internal/services_stub.h index 5e26d41dff31c..92df911759265 100644 --- a/google/cloud/run/v2/internal/services_stub.h +++ b/google/cloud/run/v2/internal/services_stub.h @@ -124,12 +124,9 @@ class DefaultServicesStub : public ServicesStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateService( google::cloud::CompletionQueue& cq, @@ -213,7 +210,6 @@ class DefaultServicesStub : public ServicesStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/run/v2/internal/services_stub_factory.cc b/google/cloud/run/v2/internal/services_stub_factory.cc index 56e5be5b918f5..4b8606e3871e8 100644 --- a/google/cloud/run/v2/internal/services_stub_factory.cc +++ b/google/cloud/run/v2/internal/services_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultServicesStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::run::v2::Services::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc index 71fb2fa4acdb4..9ff0f9ff508bb 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.cc @@ -501,7 +501,7 @@ DefaultSecureSourceManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -518,7 +518,8 @@ future DefaultSecureSourceManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h index 46716db1948de..c9e033915554b 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub.h @@ -237,18 +237,15 @@ class DefaultSecureSourceManagerStub : public SecureSourceManagerStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstances( @@ -431,12 +428,11 @@ class DefaultSecureSourceManagerStub : public SecureSourceManagerStub { std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc index 68baee23d5390..124bd48abe5af 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_stub_factory.cc @@ -48,15 +48,13 @@ std::shared_ptr CreateDefaultSecureSourceManagerStub( auto service_grpc_stub = google::cloud::securesourcemanager::v1::SecureSourceManager::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_stub.cc index 69f1c41c81aa4..5d1b0d739b28f 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_stub.cc @@ -973,7 +973,7 @@ DefaultSecurityCenterStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -990,7 +990,8 @@ future DefaultSecurityCenterStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.h b/google/cloud/securitycenter/v1/internal/security_center_stub.h index eaa3f27bd3708..d79cd749ae0a7 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub.h +++ b/google/cloud/securitycenter/v1/internal/security_center_stub.h @@ -469,12 +469,9 @@ class DefaultSecurityCenterStub : public SecurityCenterStub { google::cloud::securitycenter::v1::SecurityCenter::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncBulkMuteFindings( google::cloud::CompletionQueue& cq, @@ -900,7 +897,6 @@ class DefaultSecurityCenterStub : public SecurityCenterStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc index bfb62337f93c3..063f11fa446be 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultSecurityCenterStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::securitycenter::v1::SecurityCenter::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub.cc b/google/cloud/securitycenter/v2/internal/security_center_stub.cc index 1577b4d39b54a..b0463f5dc952f 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_stub.cc @@ -613,7 +613,7 @@ DefaultSecurityCenterStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -630,7 +630,8 @@ future DefaultSecurityCenterStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub.h b/google/cloud/securitycenter/v2/internal/security_center_stub.h index 37444f668215a..e9a141bf926ea 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub.h +++ b/google/cloud/securitycenter/v2/internal/security_center_stub.h @@ -303,12 +303,9 @@ class DefaultSecurityCenterStub : public SecurityCenterStub { google::cloud::securitycenter::v2::SecurityCenter::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr @@ -565,7 +562,6 @@ class DefaultSecurityCenterStub : public SecurityCenterStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc b/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc index 88ad6568c7c14..c14c0ad6a439d 100644 --- a/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc +++ b/google/cloud/securitycenter/v2/internal/security_center_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultSecurityCenterStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::securitycenter::v2::SecurityCenter::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc b/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc index d24649d2d5376..6504c930dfd4e 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub.cc @@ -352,7 +352,7 @@ DefaultServiceManagerStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -369,7 +369,8 @@ future DefaultServiceManagerStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub.h b/google/cloud/servicemanagement/v1/internal/service_manager_stub.h index 2ed4be8e52745..6d07b37103b53 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub.h +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub.h @@ -184,15 +184,12 @@ class DefaultServiceManagerStub : public ServiceManagerStub { std::unique_ptr< google::api::servicemanagement::v1::ServiceManager::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListServices(grpc::ClientContext& context, Options const& options, @@ -329,10 +326,9 @@ class DefaultServiceManagerStub : public ServiceManagerStub { std::unique_ptr< google::api::servicemanagement::v1::ServiceManager::StubInterface> grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc b/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc index 57c54e776b702..4e9cae2222a10 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultServiceManagerStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::api::servicemanagement::v1::ServiceManager::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub.cc b/google/cloud/serviceusage/v1/internal/service_usage_stub.cc index 4161e1ab495dc..717c825848f99 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub.cc @@ -194,7 +194,7 @@ DefaultServiceUsageStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -211,7 +211,8 @@ future DefaultServiceUsageStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub.h b/google/cloud/serviceusage/v1/internal/service_usage_stub.h index a27f4f49896af..48ebbc130f100 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub.h +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub.h @@ -113,12 +113,9 @@ class DefaultServiceUsageStub : public ServiceUsageStub { google::api::serviceusage::v1::ServiceUsage::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncEnableService( google::cloud::CompletionQueue& cq, @@ -195,7 +192,6 @@ class DefaultServiceUsageStub : public ServiceUsageStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc b/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc index 99da1427e107d..dd5099889271f 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultServiceUsageStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::api::serviceusage::v1::ServiceUsage::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/shell/v1/internal/cloud_shell_stub.cc b/google/cloud/shell/v1/internal/cloud_shell_stub.cc index bfe2d602fe229..8af6fc920f1b0 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_stub.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_stub.cc @@ -177,7 +177,7 @@ DefaultCloudShellServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -194,7 +194,8 @@ future DefaultCloudShellServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/shell/v1/internal/cloud_shell_stub.h b/google/cloud/shell/v1/internal/cloud_shell_stub.h index 2cb17122b0a98..05af3728101cf 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_stub.h +++ b/google/cloud/shell/v1/internal/cloud_shell_stub.h @@ -104,8 +104,9 @@ class DefaultCloudShellServiceStub : public CloudShellServiceStub { google::cloud::shell::v1::CloudShellService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr GetEnvironment( grpc::ClientContext& context, Options const& options, @@ -170,7 +171,8 @@ class DefaultCloudShellServiceStub : public CloudShellServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/admin/internal/database_admin_stub.cc b/google/cloud/spanner/admin/internal/database_admin_stub.cc index 85f84bb5007be..ac6cfbc93ab80 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub.cc +++ b/google/cloud/spanner/admin/internal/database_admin_stub.cc @@ -515,7 +515,7 @@ DefaultDatabaseAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -532,7 +532,8 @@ future DefaultDatabaseAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/spanner/admin/internal/database_admin_stub.h b/google/cloud/spanner/admin/internal/database_admin_stub.h index 320050e34e3ab..2243e34a10520 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub.h +++ b/google/cloud/spanner/admin/internal/database_admin_stub.h @@ -253,12 +253,9 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub { google::spanner::admin::database::v1::DatabaseAdmin::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListDatabases( @@ -467,7 +464,6 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc b/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc index 326f6eb10b895..a11c9d8b1535f 100644 --- a/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc +++ b/google/cloud/spanner/admin/internal/database_admin_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultDatabaseAdminStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::spanner::admin::database::v1::DatabaseAdmin::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/spanner/admin/internal/instance_admin_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_stub.cc index cab190f9d3fb9..d31d90bb30fa5 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_stub.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_stub.cc @@ -454,7 +454,7 @@ DefaultInstanceAdminStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -471,7 +471,8 @@ future DefaultInstanceAdminStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/spanner/admin/internal/instance_admin_stub.h b/google/cloud/spanner/admin/internal/instance_admin_stub.h index 64801ede6e0b6..e3a01304aa308 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_stub.h +++ b/google/cloud/spanner/admin/internal/instance_admin_stub.h @@ -225,8 +225,9 @@ class DefaultInstanceAdminStub : public InstanceAdminStub { google::spanner::admin::instance::v1::InstanceAdmin::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr ListInstanceConfigs( @@ -404,7 +405,8 @@ class DefaultInstanceAdminStub : public InstanceAdminStub { std::unique_ptr< google::spanner::admin::instance::v1::InstanceAdmin::StubInterface> grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v1/internal/speech_stub.cc b/google/cloud/speech/v1/internal/speech_stub.cc index 40218130d66f7..f1d635cb54942 100644 --- a/google/cloud/speech/v1/internal/speech_stub.cc +++ b/google/cloud/speech/v1/internal/speech_stub.cc @@ -127,7 +127,7 @@ DefaultSpeechStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -144,7 +144,8 @@ future DefaultSpeechStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/speech/v1/internal/speech_stub.h b/google/cloud/speech/v1/internal/speech_stub.h index 5a0e88ebbd7a5..404d8dab06263 100644 --- a/google/cloud/speech/v1/internal/speech_stub.h +++ b/google/cloud/speech/v1/internal/speech_stub.h @@ -91,12 +91,9 @@ class DefaultSpeechStub : public SpeechStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr Recognize( grpc::ClientContext& context, Options const& options, @@ -146,7 +143,6 @@ class DefaultSpeechStub : public SpeechStub { std::unique_ptr grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v1/internal/speech_stub_factory.cc b/google/cloud/speech/v1/internal/speech_stub_factory.cc index 40c5da8b021ad..3005e1eb4be59 100644 --- a/google/cloud/speech/v1/internal/speech_stub_factory.cc +++ b/google/cloud/speech/v1/internal/speech_stub_factory.cc @@ -44,10 +44,8 @@ std::shared_ptr CreateDefaultSpeechStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::speech::v1::Speech::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/speech/v2/internal/speech_stub.cc b/google/cloud/speech/v2/internal/speech_stub.cc index c90b200a6519e..03e60e63c6850 100644 --- a/google/cloud/speech/v2/internal/speech_stub.cc +++ b/google/cloud/speech/v2/internal/speech_stub.cc @@ -613,7 +613,7 @@ DefaultSpeechStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -630,7 +630,8 @@ future DefaultSpeechStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/speech/v2/internal/speech_stub.h b/google/cloud/speech/v2/internal/speech_stub.h index f23c057c017c2..8b3da0a839668 100644 --- a/google/cloud/speech/v2/internal/speech_stub.h +++ b/google/cloud/speech/v2/internal/speech_stub.h @@ -269,16 +269,13 @@ class DefaultSpeechStub : public SpeechStub { DefaultSpeechStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateRecognizer( google::cloud::CompletionQueue& cq, @@ -518,11 +515,10 @@ class DefaultSpeechStub : public SpeechStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/speech/v2/internal/speech_stub_factory.cc b/google/cloud/speech/v2/internal/speech_stub_factory.cc index 1a9d278fd1b8c..234472c27e88b 100644 --- a/google/cloud/speech/v2/internal/speech_stub_factory.cc +++ b/google/cloud/speech/v2/internal/speech_stub_factory.cc @@ -45,13 +45,10 @@ std::shared_ptr CreateDefaultSpeechStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::speech::v2::Speech::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc b/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc index bbc7f4ba68753..df5950138bce4 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc +++ b/google/cloud/storagecontrol/v2/internal/storage_control_stub.cc @@ -180,7 +180,7 @@ DefaultStorageControlStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -197,7 +197,8 @@ future DefaultStorageControlStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/storagecontrol/v2/internal/storage_control_stub.h b/google/cloud/storagecontrol/v2/internal/storage_control_stub.h index 9403b33f8e997..cb9e269758f48 100644 --- a/google/cloud/storagecontrol/v2/internal/storage_control_stub.h +++ b/google/cloud/storagecontrol/v2/internal/storage_control_stub.h @@ -112,8 +112,9 @@ class DefaultStorageControlStub : public StorageControlStub { google::storage::control::v2::StorageControl::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} StatusOr CreateFolder( grpc::ClientContext& context, Options const& options, @@ -185,7 +186,8 @@ class DefaultStorageControlStub : public StorageControlStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc index 760bf2d97c672..3b6d2bef540ce 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.cc @@ -266,7 +266,7 @@ DefaultStorageTransferServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -283,7 +283,8 @@ future DefaultStorageTransferServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h index f175c8b662cb9..f7a283590b6af 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub.h @@ -138,12 +138,9 @@ class DefaultStorageTransferServiceStub : public StorageTransferServiceStub { google::storagetransfer::v1::StorageTransferService::StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetGoogleServiceAccount( @@ -252,7 +249,6 @@ class DefaultStorageTransferServiceStub : public StorageTransferServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc index 50587bb64dcd5..020c9993b656c 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_stub_factory.cc @@ -46,11 +46,9 @@ CreateDefaultStorageTransferServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::storagetransfer::v1::StorageTransferService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/talent/v4/internal/job_stub.cc b/google/cloud/talent/v4/internal/job_stub.cc index 10545debcfd36..db2a59614d6d6 100644 --- a/google/cloud/talent/v4/internal/job_stub.cc +++ b/google/cloud/talent/v4/internal/job_stub.cc @@ -222,7 +222,7 @@ DefaultJobServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -239,7 +239,8 @@ future DefaultJobServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/talent/v4/internal/job_stub.h b/google/cloud/talent/v4/internal/job_stub.h index 1b6290b9da37c..9dec0dcff0010 100644 --- a/google/cloud/talent/v4/internal/job_stub.h +++ b/google/cloud/talent/v4/internal/job_stub.h @@ -120,12 +120,9 @@ class DefaultJobServiceStub : public JobServiceStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateJob( grpc::ClientContext& context, Options const& options, @@ -212,7 +209,6 @@ class DefaultJobServiceStub : public JobServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/talent/v4/internal/job_stub_factory.cc b/google/cloud/talent/v4/internal/job_stub_factory.cc index c3d1f089bf4ed..63820f2e284a9 100644 --- a/google/cloud/talent/v4/internal/job_stub_factory.cc +++ b/google/cloud/talent/v4/internal/job_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultJobServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::talent::v4::JobService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc index c25f638b614fd..82497e9d4c9a9 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.cc @@ -663,7 +663,7 @@ DefaultTelcoAutomationStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -680,7 +680,8 @@ future DefaultTelcoAutomationStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h index 6eea109cc19f5..6c64e010d42e4 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub.h @@ -328,16 +328,13 @@ class DefaultTelcoAutomationStub : public TelcoAutomationStub { std::unique_ptr< google::cloud::telcoautomation::v1::TelcoAutomation::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr< google::cloud::telcoautomation::v1::ListOrchestrationClustersResponse> @@ -608,11 +605,10 @@ class DefaultTelcoAutomationStub : public TelcoAutomationStub { std::unique_ptr< google::cloud::telcoautomation::v1::TelcoAutomation::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc b/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc index 6269e2b0fff79..4a4d3f044b29a 100644 --- a/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc +++ b/google/cloud/telcoautomation/v1/internal/telco_automation_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultTelcoAutomationStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::telcoautomation::v1::TelcoAutomation::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/tpu/v1/internal/tpu_stub.cc b/google/cloud/tpu/v1/internal/tpu_stub.cc index e52e949dad0ec..cb240fab5a686 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub.cc +++ b/google/cloud/tpu/v1/internal/tpu_stub.cc @@ -321,7 +321,7 @@ DefaultTpuStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -338,7 +338,8 @@ future DefaultTpuStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/tpu/v1/internal/tpu_stub.h b/google/cloud/tpu/v1/internal/tpu_stub.h index 5b908428b9de0..82d3fd23bc2dc 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub.h +++ b/google/cloud/tpu/v1/internal/tpu_stub.h @@ -158,16 +158,13 @@ class DefaultTpuStub : public TpuStub { public: DefaultTpuStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListNodes( grpc::ClientContext& context, Options const& options, @@ -287,11 +284,10 @@ class DefaultTpuStub : public TpuStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/tpu/v1/internal/tpu_stub_factory.cc b/google/cloud/tpu/v1/internal/tpu_stub_factory.cc index a01bcacbeea88..e4138c3cf40bc 100644 --- a/google/cloud/tpu/v1/internal/tpu_stub_factory.cc +++ b/google/cloud/tpu/v1/internal/tpu_stub_factory.cc @@ -45,13 +45,10 @@ std::shared_ptr CreateDefaultTpuStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::tpu::v1::Tpu::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/tpu/v2/internal/tpu_stub.cc b/google/cloud/tpu/v2/internal/tpu_stub.cc index d3b0aa69cb5c7..4527cda15cbf0 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub.cc +++ b/google/cloud/tpu/v2/internal/tpu_stub.cc @@ -345,7 +345,7 @@ DefaultTpuStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -362,7 +362,8 @@ future DefaultTpuStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/tpu/v2/internal/tpu_stub.h b/google/cloud/tpu/v2/internal/tpu_stub.h index 292e3b66d1553..cf41b0880e543 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub.h +++ b/google/cloud/tpu/v2/internal/tpu_stub.h @@ -168,16 +168,13 @@ class DefaultTpuStub : public TpuStub { public: DefaultTpuStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListNodes( grpc::ClientContext& context, Options const& options, @@ -306,11 +303,10 @@ class DefaultTpuStub : public TpuStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/tpu/v2/internal/tpu_stub_factory.cc b/google/cloud/tpu/v2/internal/tpu_stub_factory.cc index 7b48844c3d5a3..aab369ea8f042 100644 --- a/google/cloud/tpu/v2/internal/tpu_stub_factory.cc +++ b/google/cloud/tpu/v2/internal/tpu_stub_factory.cc @@ -45,13 +45,10 @@ std::shared_ptr CreateDefaultTpuStub( auto channel = auth->CreateChannel(options.get(), internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::tpu::v2::Tpu::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/translate/v3/internal/translation_stub.cc b/google/cloud/translate/v3/internal/translation_stub.cc index c935eef3a11dc..aed06074902e4 100644 --- a/google/cloud/translate/v3/internal/translation_stub.cc +++ b/google/cloud/translate/v3/internal/translation_stub.cc @@ -800,7 +800,7 @@ DefaultTranslationServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -817,7 +817,8 @@ future DefaultTranslationServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/translate/v3/internal/translation_stub.h b/google/cloud/translate/v3/internal/translation_stub.h index d08b26ae48de9..31c1f3307eeb1 100644 --- a/google/cloud/translate/v3/internal/translation_stub.h +++ b/google/cloud/translate/v3/internal/translation_stub.h @@ -351,16 +351,13 @@ class DefaultTranslationServiceStub : public TranslationServiceStub { std::unique_ptr< google::cloud::translation::v3::TranslationService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr TranslateText( grpc::ClientContext& context, Options const& options, @@ -682,11 +679,10 @@ class DefaultTranslationServiceStub : public TranslationServiceStub { std::unique_ptr< google::cloud::translation::v3::TranslationService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/translate/v3/internal/translation_stub_factory.cc b/google/cloud/translate/v3/internal/translation_stub_factory.cc index e038c59362b84..a714758e81371 100644 --- a/google/cloud/translate/v3/internal/translation_stub_factory.cc +++ b/google/cloud/translate/v3/internal/translation_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultTranslationServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::translation::v3::TranslationService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub.cc b/google/cloud/video/livestream/v1/internal/livestream_stub.cc index 850801dfeb67f..20208a30822ff 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_stub.cc @@ -672,7 +672,7 @@ DefaultLivestreamServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -689,7 +689,8 @@ future DefaultLivestreamServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub.h b/google/cloud/video/livestream/v1/internal/livestream_stub.h index b46b422604f54..bcef752d2a7d3 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub.h +++ b/google/cloud/video/livestream/v1/internal/livestream_stub.h @@ -299,16 +299,13 @@ class DefaultLivestreamServiceStub : public LivestreamServiceStub { std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateChannel( google::cloud::CompletionQueue& cq, @@ -571,11 +568,10 @@ class DefaultLivestreamServiceStub : public LivestreamServiceStub { std::unique_ptr< google::cloud::video::livestream::v1::LivestreamService::StubInterface> grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc b/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc index b6807d6deae38..d26b5c68daf9d 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultLivestreamServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::video::livestream::v1::LivestreamService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc index a428fdb9b12c8..ff6895c41746d 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.cc @@ -692,7 +692,7 @@ DefaultVideoStitcherServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -709,7 +709,8 @@ future DefaultVideoStitcherServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h index 9083f1cbabdf5..a51a4f06b96d8 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub.h @@ -323,12 +323,9 @@ class DefaultVideoStitcherServiceStub : public VideoStitcherServiceStub { StubInterface> grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateCdnKey( google::cloud::CompletionQueue& cq, @@ -606,7 +603,6 @@ class DefaultVideoStitcherServiceStub : public VideoStitcherServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc index f664d7d1a12ca..f465cb88f44ba 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_stub_factory.cc @@ -46,11 +46,9 @@ std::shared_ptr CreateDefaultVideoStitcherServiceStub( auto service_grpc_stub = google::cloud::video::stitcher::v1::VideoStitcherService::NewStub( channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc index a65bfb9558e57..56bf7124c77ea 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.cc @@ -75,7 +75,7 @@ DefaultVideoIntelligenceServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -92,7 +92,8 @@ future DefaultVideoIntelligenceServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h index 4091116d9a141..06ba3bd07bae1 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_stub.h @@ -71,8 +71,9 @@ class DefaultVideoIntelligenceServiceStub VideoIntelligenceService::StubInterface> grpc_stub, std::unique_ptr - operations) - : grpc_stub_(std::move(grpc_stub)), operations_(std::move(operations)) {} + operations_stub) + : grpc_stub_(std::move(grpc_stub)), + operations_stub_(std::move(operations_stub)) {} future> AsyncAnnotateVideo( google::cloud::CompletionQueue& cq, @@ -102,7 +103,8 @@ class DefaultVideoIntelligenceServiceStub std::unique_ptr grpc_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vision/v1/internal/image_annotator_stub.cc b/google/cloud/vision/v1/internal/image_annotator_stub.cc index 2e6ac8552c826..f4525e14b5789 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub.cc +++ b/google/cloud/vision/v1/internal/image_annotator_stub.cc @@ -144,7 +144,7 @@ DefaultImageAnnotatorStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -161,7 +161,8 @@ future DefaultImageAnnotatorStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/vision/v1/internal/image_annotator_stub.h b/google/cloud/vision/v1/internal/image_annotator_stub.h index 902aba00ca87b..17660ea21af4f 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub.h +++ b/google/cloud/vision/v1/internal/image_annotator_stub.h @@ -97,12 +97,9 @@ class DefaultImageAnnotatorStub : public ImageAnnotatorStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr BatchAnnotateImages( @@ -161,7 +158,6 @@ class DefaultImageAnnotatorStub : public ImageAnnotatorStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc b/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc index 2c44056459dd3..eb09e92277032 100644 --- a/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc +++ b/google/cloud/vision/v1/internal/image_annotator_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultImageAnnotatorStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::vision::v1::ImageAnnotator::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/vision/v1/internal/product_search_stub.cc b/google/cloud/vision/v1/internal/product_search_stub.cc index ef616d0f29750..f316ab7c9bcac 100644 --- a/google/cloud/vision/v1/internal/product_search_stub.cc +++ b/google/cloud/vision/v1/internal/product_search_stub.cc @@ -318,7 +318,7 @@ DefaultProductSearchStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -335,7 +335,8 @@ future DefaultProductSearchStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/vision/v1/internal/product_search_stub.h b/google/cloud/vision/v1/internal/product_search_stub.h index 31e70045721d4..9c8ca490ef6bf 100644 --- a/google/cloud/vision/v1/internal/product_search_stub.h +++ b/google/cloud/vision/v1/internal/product_search_stub.h @@ -160,12 +160,9 @@ class DefaultProductSearchStub : public ProductSearchStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr CreateProductSet( grpc::ClientContext& context, Options const& options, @@ -291,7 +288,6 @@ class DefaultProductSearchStub : public ProductSearchStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vision/v1/internal/product_search_stub_factory.cc b/google/cloud/vision/v1/internal/product_search_stub_factory.cc index a3b69dc05f96a..6694d6918548f 100644 --- a/google/cloud/vision/v1/internal/product_search_stub_factory.cc +++ b/google/cloud/vision/v1/internal/product_search_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultProductSearchStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::vision::v1::ProductSearch::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc b/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc index 5bfab07c3414a..c1037fb592503 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub.cc @@ -1185,7 +1185,7 @@ DefaultVmMigrationStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1202,7 +1202,8 @@ future DefaultVmMigrationStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub.h b/google/cloud/vmmigration/v1/internal/vm_migration_stub.h index 5c02a11909bb2..c164302679b74 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub.h +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub.h @@ -505,16 +505,13 @@ class DefaultVmMigrationStub : public VmMigrationStub { std::unique_ptr< google::cloud::vmmigration::v1::VmMigration::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListSources( grpc::ClientContext& context, Options const& options, @@ -982,11 +979,10 @@ class DefaultVmMigrationStub : public VmMigrationStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc b/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc index 5edb0b61cd9ed..3e11e0d9eb3fc 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultVmMigrationStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::vmmigration::v1::VmMigration::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc index 351084629c476..136a97b13a8c4 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.cc @@ -1888,7 +1888,7 @@ DefaultVmwareEngineStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -1905,7 +1905,8 @@ future DefaultVmwareEngineStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h index 28c5f4a6d6a5b..a801623cc8905 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub.h @@ -797,18 +797,15 @@ class DefaultVmwareEngineStub : public VmwareEngineStub { std::unique_ptr< google::cloud::vmwareengine::v1::VmwareEngine::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListPrivateClouds( @@ -1531,12 +1528,11 @@ class DefaultVmwareEngineStub : public VmwareEngineStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr iampolicy_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc index df05decb96461..9637bff0e0ad1 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_stub_factory.cc @@ -47,15 +47,13 @@ std::shared_ptr CreateDefaultVmwareEngineStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::vmwareengine::v1::VmwareEngine::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), + std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc index c705c1e2c0357..9e4b31f91edbc 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.cc @@ -166,7 +166,7 @@ DefaultVpcAccessServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -183,7 +183,8 @@ future DefaultVpcAccessServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h index 2175022891943..fde54cbd23b14 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub.h @@ -100,16 +100,13 @@ class DefaultVpcAccessServiceStub : public VpcAccessServiceStub { std::unique_ptr< google::cloud::vpcaccess::v1::VpcAccessService::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} future> AsyncCreateConnector( google::cloud::CompletionQueue& cq, @@ -172,11 +169,10 @@ class DefaultVpcAccessServiceStub : public VpcAccessServiceStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc index aa96230a5732e..0e960ed240076 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_stub_factory.cc @@ -46,14 +46,11 @@ std::shared_ptr CreateDefaultVpcAccessServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::vpcaccess::v1::VpcAccessService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub.cc b/google/cloud/webrisk/v1/internal/web_risk_stub.cc index 12e179c919b41..42fb29e7e62da 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_stub.cc @@ -167,7 +167,7 @@ DefaultWebRiskServiceStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -184,7 +184,8 @@ future DefaultWebRiskServiceStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub.h b/google/cloud/webrisk/v1/internal/web_risk_stub.h index ee5e31f5c267c..85719feb2d220 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub.h +++ b/google/cloud/webrisk/v1/internal/web_risk_stub.h @@ -102,12 +102,9 @@ class DefaultWebRiskServiceStub : public WebRiskServiceStub { std::unique_ptr grpc_stub, std::unique_ptr - operations_stub, - std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ComputeThreatListDiff( @@ -171,7 +168,6 @@ class DefaultWebRiskServiceStub : public WebRiskServiceStub { grpc_stub_; std::unique_ptr operations_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc b/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc index afc6a58aa918d..4bfcc94696a70 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_stub_factory.cc @@ -45,11 +45,9 @@ std::shared_ptr CreateDefaultWebRiskServiceStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::webrisk::v1::WebRiskService::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), + std::move(service_grpc_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/workflows/v1/internal/workflows_stub.cc b/google/cloud/workflows/v1/internal/workflows_stub.cc index f4ade87d3ca34..2124936d67a89 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub.cc +++ b/google/cloud/workflows/v1/internal/workflows_stub.cc @@ -212,7 +212,7 @@ DefaultWorkflowsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -229,7 +229,8 @@ future DefaultWorkflowsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/workflows/v1/internal/workflows_stub.h b/google/cloud/workflows/v1/internal/workflows_stub.h index cdef9da9a0a0f..ab6a62129bd45 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub.h +++ b/google/cloud/workflows/v1/internal/workflows_stub.h @@ -117,16 +117,13 @@ class DefaultWorkflowsStub : public WorkflowsStub { DefaultWorkflowsStub( std::unique_ptr grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr locations_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), locations_stub_(std::move(locations_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr ListWorkflows( grpc::ClientContext& context, Options const& options, @@ -208,11 +205,10 @@ class DefaultWorkflowsStub : public WorkflowsStub { private: std::unique_ptr grpc_stub_; - std::unique_ptr - operations_stub_; std::unique_ptr locations_stub_; - std::unique_ptr operations_; + std::unique_ptr + operations_stub_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/workflows/v1/internal/workflows_stub_factory.cc b/google/cloud/workflows/v1/internal/workflows_stub_factory.cc index d95f06d1caa24..18bc1b778b7ed 100644 --- a/google/cloud/workflows/v1/internal/workflows_stub_factory.cc +++ b/google/cloud/workflows/v1/internal/workflows_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultWorkflowsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::workflows::v1::Workflows::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_locations_stub = google::cloud::location::Locations::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_locations_stub), + std::move(service_grpc_stub), std::move(service_locations_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) { diff --git a/google/cloud/workstations/v1/internal/workstations_stub.cc b/google/cloud/workstations/v1/internal/workstations_stub.cc index 6455830b1cb4b..c99b1da839ea1 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub.cc +++ b/google/cloud/workstations/v1/internal/workstations_stub.cc @@ -606,7 +606,7 @@ DefaultWorkstationsStub::AsyncGetOperation( [this](grpc::ClientContext* context, google::longrunning::GetOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncGetOperation(context, request, cq); + return operations_stub_->AsyncGetOperation(context, request, cq); }, request, std::move(context)); } @@ -623,7 +623,8 @@ future DefaultWorkstationsStub::AsyncCancelOperation( [this](grpc::ClientContext* context, google::longrunning::CancelOperationRequest const& request, grpc::CompletionQueue* cq) { - return operations_->AsyncCancelOperation(context, request, cq); + return operations_stub_->AsyncCancelOperation(context, request, + cq); }, request, std::move(context)) .then([](future> f) { diff --git a/google/cloud/workstations/v1/internal/workstations_stub.h b/google/cloud/workstations/v1/internal/workstations_stub.h index 7a059d6af9f5f..eb598f16277f0 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub.h +++ b/google/cloud/workstations/v1/internal/workstations_stub.h @@ -286,15 +286,12 @@ class DefaultWorkstationsStub : public WorkstationsStub { std::unique_ptr< google::cloud::workstations::v1::Workstations::StubInterface> grpc_stub, - std::unique_ptr - operations_stub, std::unique_ptr iampolicy_stub, std::unique_ptr - operations) + operations_stub) : grpc_stub_(std::move(grpc_stub)), - operations_stub_(std::move(operations_stub)), iampolicy_stub_(std::move(iampolicy_stub)), - operations_(std::move(operations)) {} + operations_stub_(std::move(operations_stub)) {} StatusOr GetWorkstationCluster( @@ -528,10 +525,9 @@ class DefaultWorkstationsStub : public WorkstationsStub { private: std::unique_ptr grpc_stub_; + std::unique_ptr iampolicy_stub_; std::unique_ptr operations_stub_; - std::unique_ptr iampolicy_stub_; - std::unique_ptr operations_; }; GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END diff --git a/google/cloud/workstations/v1/internal/workstations_stub_factory.cc b/google/cloud/workstations/v1/internal/workstations_stub_factory.cc index 5d4ca629f2791..f0ef4131e6dbe 100644 --- a/google/cloud/workstations/v1/internal/workstations_stub_factory.cc +++ b/google/cloud/workstations/v1/internal/workstations_stub_factory.cc @@ -46,13 +46,10 @@ std::shared_ptr CreateDefaultWorkstationsStub( internal::MakeChannelArguments(options)); auto service_grpc_stub = google::cloud::workstations::v1::Workstations::NewStub(channel); - auto service_operations_stub = - google::longrunning::Operations::NewStub(channel); auto service_iampolicy_stub = google::iam::v1::IAMPolicy::NewStub(channel); std::shared_ptr stub = std::make_shared( - std::move(service_grpc_stub), std::move(service_operations_stub), - std::move(service_iampolicy_stub), + std::move(service_grpc_stub), std::move(service_iampolicy_stub), google::longrunning::Operations::NewStub(channel)); if (auth->RequiresConfigureContext()) {