Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

cleanup(GCS+gRPC): remove struct GrpcOwnerParser #9837

Merged
merged 1 commit into from
Sep 14, 2022
Merged

cleanup(GCS+gRPC): remove struct GrpcOwnerParser #9837

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google/cloud/storage/internal/grpc_bucket_metadata_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ google::storage::v2::Bucket GrpcBucketMetadataParser::ToProto(
}
if (rhs.has_logging()) *result.mutable_logging() = ToProto(rhs.logging());
if (rhs.has_owner()) {
*result.mutable_owner() = GrpcOwnerParser::ToProto(rhs.owner());
*result.mutable_owner() = storage_internal::ToProto(rhs.owner());
}
if (rhs.has_encryption()) {
*result.mutable_encryption() = ToProto(rhs.encryption());
Expand Down Expand Up @@ -144,7 +144,7 @@ BucketMetadata GrpcBucketMetadataParser::FromProto(
metadata.metageneration_ = rhs.metageneration();
metadata.name_ = GrpcBucketNameToId(rhs.name());
if (rhs.has_owner()) {
metadata.owner_ = GrpcOwnerParser::FromProto(rhs.owner());
metadata.owner_ = storage_internal::FromProto(rhs.owner());
}

// The protos use `projects/{project}` format, but the field may be absent or
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/internal/grpc_object_metadata_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ObjectMetadata GrpcObjectMetadataParser::FromProto(

metadata.metageneration_ = object.metageneration();
if (object.has_owner()) {
metadata.owner_ = GrpcOwnerParser::FromProto(*object.mutable_owner());
metadata.owner_ = storage_internal::FromProto(*object.mutable_owner());
}
metadata.storage_class_ = std::move(*object.mutable_storage_class());
if (object.has_create_time()) {
Expand Down
12 changes: 5 additions & 7 deletions google/cloud/storage/internal/grpc_owner_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,24 @@

namespace google {
namespace cloud {
namespace storage {
namespace storage_internal {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
namespace internal {

google::storage::v2::Owner GrpcOwnerParser::ToProto(Owner rhs) {
google::storage::v2::Owner ToProto(storage::Owner rhs) {
google::storage::v2::Owner result;
*result.mutable_entity() = std::move(rhs.entity);
*result.mutable_entity_id() = std::move(rhs.entity_id);
return result;
}

Owner GrpcOwnerParser::FromProto(google::storage::v2::Owner rhs) {
Owner result;
storage::Owner FromProto(google::storage::v2::Owner rhs) {
storage::Owner result;
result.entity = std::move(*rhs.mutable_entity());
result.entity_id = std::move(*rhs.mutable_entity_id());
return result;
}

} // namespace internal
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace storage
} // namespace storage_internal
} // namespace cloud
} // namespace google
12 changes: 4 additions & 8 deletions google/cloud/storage/internal/grpc_owner_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,14 @@

namespace google {
namespace cloud {
namespace storage {
namespace storage_internal {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
namespace internal {

struct GrpcOwnerParser {
static google::storage::v2::Owner ToProto(Owner);
static Owner FromProto(google::storage::v2::Owner);
};
google::storage::v2::Owner ToProto(storage::Owner);
storage::Owner FromProto(google::storage::v2::Owner);

} // namespace internal
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace storage
} // namespace storage_internal
} // namespace cloud
} // namespace google

Expand Down
12 changes: 5 additions & 7 deletions google/cloud/storage/internal/grpc_owner_parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@

namespace google {
namespace cloud {
namespace storage {
namespace storage_internal {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
namespace internal {
namespace {

using ::google::cloud::testing_util::IsProtoEqual;
Expand All @@ -32,16 +31,15 @@ TEST(GrpcClientFromProto, OwnerRoundtrip) {
)pb";
google::storage::v2::Owner start;
EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(kText, &start));
auto const expected = Owner{"test-entity", "test-entity-id"};
auto const middle = GrpcOwnerParser::FromProto(start);
auto const expected = storage::Owner{"test-entity", "test-entity-id"};
auto const middle = FromProto(start);
EXPECT_EQ(middle, expected);
auto const end = GrpcOwnerParser::ToProto(middle);
auto const end = ToProto(middle);
EXPECT_THAT(end, IsProtoEqual(start));
}

} // namespace
} // namespace internal
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace storage
} // namespace storage_internal
} // namespace cloud
} // namespace google