Remove PathTemplate in Spanner

googleapis · Feb 22, 2018 · 143ae90 · 143ae90
1 parent e75826d
commit 143ae90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 73 deletions.
diff --git a/google-cloud-spanner/lib/google/cloud/spanner/admin/database/v1/database_admin_client.rb b/google-cloud-spanner/lib/google/cloud/spanner/admin/database/v1/database_admin_client.rb
@@ -77,27 +77,12 @@ class OperationsClient < Google::Longrunning::OperationsClient
                 SERVICE_ADDRESS = SERVICE_ADDRESS
               end
 
-              INSTANCE_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-                "projects/{project}/instances/{instance}"
-              )
-
-              private_constant :INSTANCE_PATH_TEMPLATE
-
-              DATABASE_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-                "projects/{project}/instances/{instance}/databases/{database}"
-              )
-
-              private_constant :DATABASE_PATH_TEMPLATE
-
               # Returns a fully-qualified instance resource name string.
               # @param project [String]
               # @param instance [String]
               # @return [String]
               def self.instance_path project, instance
-                INSTANCE_PATH_TEMPLATE.render(
-                  :"project" => project,
-                  :"instance" => instance
-                )
+                "projects/#{project}/instances/#{instance}"
               end
 
               # Returns a fully-qualified database resource name string.
@@ -106,11 +91,7 @@ def self.instance_path project, instance
               # @param database [String]
               # @return [String]
               def self.database_path project, instance, database
-                DATABASE_PATH_TEMPLATE.render(
-                  :"project" => project,
-                  :"instance" => instance,
-                  :"database" => database
-                )
+                "projects/#{project}/instances/#{instance}/databases/#{database}"
               end
 
               # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]

diff --git a/google-cloud-spanner/lib/google/cloud/spanner/admin/instance/v1/instance_admin_client.rb b/google-cloud-spanner/lib/google/cloud/spanner/admin/instance/v1/instance_admin_client.rb
@@ -97,53 +97,27 @@ class OperationsClient < Google::Longrunning::OperationsClient
                 SERVICE_ADDRESS = SERVICE_ADDRESS
               end
 
-              PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-                "projects/{project}"
-              )
-
-              private_constant :PROJECT_PATH_TEMPLATE
-
-              INSTANCE_CONFIG_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-                "projects/{project}/instanceConfigs/{instance_config}"
-              )
-
-              private_constant :INSTANCE_CONFIG_PATH_TEMPLATE
-
-              INSTANCE_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-                "projects/{project}/instances/{instance}"
-              )
-
-              private_constant :INSTANCE_PATH_TEMPLATE
-
               # Returns a fully-qualified project resource name string.
               # @param project [String]
               # @return [String]
               def self.project_path project
-                PROJECT_PATH_TEMPLATE.render(
-                  :"project" => project
-                )
+                "projects/#{project}"
               end
 
               # Returns a fully-qualified instance_config resource name string.
               # @param project [String]
               # @param instance_config [String]
               # @return [String]
               def self.instance_config_path project, instance_config
-                INSTANCE_CONFIG_PATH_TEMPLATE.render(
-                  :"project" => project,
-                  :"instance_config" => instance_config
-                )
+                "projects/#{project}/instanceConfigs/#{instance_config}"
               end
 
               # Returns a fully-qualified instance resource name string.
               # @param project [String]
               # @param instance [String]
               # @return [String]
               def self.instance_path project, instance
-                INSTANCE_PATH_TEMPLATE.render(
-                  :"project" => project,
-                  :"instance" => instance
-                )
+                "projects/#{project}/instances/#{instance}"
               end
 
               # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]

diff --git a/google-cloud-spanner/lib/google/cloud/spanner/v1/spanner_client.rb b/google-cloud-spanner/lib/google/cloud/spanner/v1/spanner_client.rb
@@ -68,29 +68,13 @@ class SpannerClient
             "https://www.googleapis.com/auth/spanner.data"
           ].freeze
 
-          DATABASE_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "projects/{project}/instances/{instance}/databases/{database}"
-          )
-
-          private_constant :DATABASE_PATH_TEMPLATE
-
-          SESSION_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "projects/{project}/instances/{instance}/databases/{database}/sessions/{session}"
-          )
-
-          private_constant :SESSION_PATH_TEMPLATE
-
           # Returns a fully-qualified database resource name string.
           # @param project [String]
           # @param instance [String]
           # @param database [String]
           # @return [String]
           def self.database_path project, instance, database
-            DATABASE_PATH_TEMPLATE.render(
-              :"project" => project,
-              :"instance" => instance,
-              :"database" => database
-            )
+            "projects/#{project}/instances/#{instance}/databases/#{database}"
           end
 
           # Returns a fully-qualified session resource name string.
@@ -100,12 +84,7 @@ def self.database_path project, instance, database
           # @param session [String]
           # @return [String]
           def self.session_path project, instance, database, session
-            SESSION_PATH_TEMPLATE.render(
-              :"project" => project,
-              :"instance" => instance,
-              :"database" => database,
-              :"session" => session
-            )
+            "projects/#{project}/instances/#{instance}/databases/#{database}/sessions/#{session}"
           end
 
           # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]