clean up

Author: mpeddada1

google/cloud/storage/client_options.cc

@@ -116,30 +116,6 @@ std::string RestEndpoint(Options const& options) {
   return GetEmulator().value_or(options.get<RestEndpointOption>());
 }
 
-std::string IamRestEndpoint(Options const& options) {
-  return GetEmulator().value_or(options.get<IamEndpointOption>());
-}
-
-std::string IamRestPath() {
-  auto emulator = GetEmulator();
-  if (emulator) return "/iamapi";
-  return {};
-}
-
-std::string JsonEndpoint(Options const& options) {
-  return GetEmulator().value_or(options.get<RestEndpointOption>()) +
-         "/storage/" + options.get<TargetApiVersionOption>();
-}
-
-std::string JsonUploadEndpoint(Options const& options) {
-  return GetEmulator().value_or(options.get<RestEndpointOption>()) +
-         "/upload/storage/" + options.get<TargetApiVersionOption>();
-}
-
-std::string XmlEndpoint(Options const& options) {
-  return GetEmulator().value_or(options.get<RestEndpointOption>());
-}
-
 std::string IamEndpoint(Options const& options) {
   auto emulator = GetEmulator();
   if (emulator) return *emulator + "/iamapi";

google/cloud/storage/client_options.h

@@ -30,11 +30,6 @@ namespace storage {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 namespace internal {
 std::string RestEndpoint(Options const&);
-std::string IamRestEndpoint(Options const&);
-std::string IamRestPath();
-std::string JsonEndpoint(Options const&);
-std::string JsonUploadEndpoint(Options const&);
-std::string XmlEndpoint(Options const&);
 std::string IamEndpoint(Options const&);
 
 Options ApplyPolicy(Options opts, RetryPolicy const& p);

google/cloud/storage/client_options_test.cc

@@ -91,10 +91,6 @@ TEST_F(ClientOptionsTest, EndpointsDefault) {
       internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {});
   EXPECT_EQ("https://storage.googleapis.com",
             options.get<RestEndpointOption>());
-  EXPECT_EQ("https://storage.googleapis.com/storage/v1",
-            internal::JsonEndpoint(options));
-  EXPECT_EQ("https://storage.googleapis.com/upload/storage/v1",
-            internal::JsonUploadEndpoint(options));
   EXPECT_EQ("https://iamcredentials.googleapis.com/v1",
             internal::IamEndpoint(options));
 }
@@ -106,11 +102,6 @@ TEST_F(ClientOptionsTest, EndpointsOverride) {
       oauth2::CreateAnonymousCredentials(),
       Options{}.set<RestEndpointOption>("http://127.0.0.1.nip.io:1234"));
   EXPECT_EQ("http://127.0.0.1.nip.io:1234", options.get<RestEndpointOption>());
-  EXPECT_EQ("http://127.0.0.1.nip.io:1234/storage/v1",
-            internal::JsonEndpoint(options));
-  EXPECT_EQ("http://127.0.0.1.nip.io:1234/upload/storage/v1",
-            internal::JsonUploadEndpoint(options));
-  EXPECT_EQ("http://127.0.0.1.nip.io:1234", internal::XmlEndpoint(options));
   EXPECT_EQ("https://iamcredentials.googleapis.com/v1",
             internal::IamEndpoint(options));
 }
@@ -121,11 +112,6 @@ TEST_F(ClientOptionsTest, EndpointsEmulator) {
   auto options =
       internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {});
   EXPECT_EQ("http://localhost:1234", options.get<RestEndpointOption>());
-  EXPECT_EQ("http://localhost:1234/storage/v1",
-            internal::JsonEndpoint(options));
-  EXPECT_EQ("http://localhost:1234/upload/storage/v1",
-            internal::JsonUploadEndpoint(options));
-  EXPECT_EQ("http://localhost:1234", internal::XmlEndpoint(options));
   EXPECT_EQ("http://localhost:1234/iamapi", internal::IamEndpoint(options));
 }
 
@@ -136,25 +122,9 @@ TEST_F(ClientOptionsTest, OldEndpointsEmulator) {
   auto options =
       internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {});
   EXPECT_EQ("http://localhost:1234", options.get<RestEndpointOption>());
-  EXPECT_EQ("http://localhost:1234/storage/v1",
-            internal::JsonEndpoint(options));
-  EXPECT_EQ("http://localhost:1234/upload/storage/v1",
-            internal::JsonUploadEndpoint(options));
-  EXPECT_EQ("http://localhost:1234", internal::XmlEndpoint(options));
   EXPECT_EQ("http://localhost:1234/iamapi", internal::IamEndpoint(options));
 }
 
-TEST_F(ClientOptionsTest, SetVersion) {
-  auto options = internal::DefaultOptions(
-      oauth2::CreateAnonymousCredentials(),
-      Options{}.set<internal::TargetApiVersionOption>("vTest"));
-  EXPECT_EQ("vTest", options.get<internal::TargetApiVersionOption>());
-  EXPECT_EQ("https://storage.googleapis.com/storage/vTest",
-            internal::JsonEndpoint(options));
-  EXPECT_EQ("https://storage.googleapis.com/upload/storage/vTest",
-            internal::JsonUploadEndpoint(options));
-}
-
 TEST_F(ClientOptionsTest, DefaultOptions) {
   auto o = internal::DefaultOptions(oauth2::CreateAnonymousCredentials(), {});
   EXPECT_EQ("https://storage.googleapis.com", o.get<RestEndpointOption>());