lib/gapic/presenters/service_presenter.rb in gapic-generator-0.5.0 vs lib/gapic/presenters/service_presenter.rb in gapic-generator-0.5.1

@@ -87,11 +87,11 @@
       def doc_description disable_xrefs: false
         @service.docs_leading_comments disable_xrefs: disable_xrefs
       end
 
       def name
-        @service.name
+        @api.fix_service_name @service.name
       end
 
       # The namespace of the protos. This may be different from the client
       # namespace for a common service.
       def proto_namespace
@@ -100,11 +100,11 @@
         namespace = ruby_namespace_for_address @service.address[0...-1]
         @api.override_proto_namespaces? ? fix_namespace(@api, namespace) : namespace
       end
 
       def proto_service_name_full
-        name_full = "#{proto_namespace}::#{name}"
+        name_full = "#{proto_namespace}::#{@service.name}"
         @api.override_proto_namespaces? ? fix_namespace(@api, name_full) : name_full
       end
 
       def module_name
         service_name_full.split("::").last
@@ -196,13 +196,9 @@
 
       def client_scopes
         common_service_delegate&.client_scopes ||
           @service.scopes ||
           default_config(:oauth_scopes)
-      end
-
-      def client_proto_name
-        @service.address.join "."
       end
 
       def credentials_name
         "Credentials"
       end