gapic-generator 0.9.1 → 0.11.0

data/templates/default/service/client/_client.erb

@@ -2,6 +2,13 @@
 <% @requires = capture do %>
 <%= render partial: "service/client/requires", locals: { service: service} -%>
 require "<%= service.proto_service_require %>"
+<%- if service.subclients? -%>
+<%- service.subclients.each do |subclient| -%>
+<%- unless subclient.client_class_name == "Operations" -%>
+require "<%= subclient.require_str %>"
+<%- end -%>
+<%- end -%>
+<%- end -%>
 <% end %>
 ##
 # Client for the <%= service.name %> service.
@@ -23,14 +30,17 @@ class <%= service.client_name %>
   #
   # See {<%= service.client_name_full %>::Configuration}
   # for a description of the configuration fields.
+<%- if service.is_deprecated? -%>
   #
-  # ## Example
+  # @deprecated This service is deprecated and may be removed in the next major version update.
+<%- end -%>
   #
-  # To modify the configuration for all <%= service.name %> clients:
+  # @example
   #
-  #     <%= service.client_name_full %>.configure do |config|
-  #       config.timeout = 10.0
-  #     end
+  #   # Modify the configuration for all <%= service.name %> clients
+  #   <%= service.client_name_full %>.configure do |config|
+  #     config.timeout = 10.0
+  #   end
   #
   # @yield [config] Configure the <%= service.client_name %> client.
   # @yieldparam config [<%= service.client_name %>::Configuration]
@@ -64,19 +74,15 @@ class <%= service.client_name %>
   ##
   # Create a new <%= service.name %> client object.
   #
-  # ## Examples
+  # @example
   #
-  # To create a new <%= service.name %> client with the default
-  # configuration:
+  #   # Create a client using the default configuration
+  #   client = <%= service.client_name_full %>.new
   #
-  #     client = <%= service.client_name_full %>.new
-  #
-  # To create a new <%= service.name %> client with a custom
-  # configuration:
-  #
-  #     client = <%= service.client_name_full %>.new do |config|
-  #       config.timeout = 10.0
-  #     end
+  #   # Create a client using a custom configuration
+  #   client = <%= service.client_name_full %>.new do |config|
+  #     config.timeout = 10.0
+  #   end
   #
   # @yield [config] Configure the <%= service.name %> client.
   # @yieldparam config [<%= service.client_name %>::Configuration]
@@ -97,10 +103,9 @@ class <%= service.client_name %>
     # Create credentials
     credentials = @config.credentials
     <%- unless service.generic_endpoint? -%>
-    # Use self-signed JWT if the scope and endpoint are unchanged from default,
+    # Use self-signed JWT if the endpoint is unchanged from default,
     # but only if the default endpoint does not have a region prefix.
-    enable_self_signed_jwt = @config.scope == <%= service.client_name %>.configure.scope &&
-                             @config.endpoint == <%= service.client_name %>.configure.endpoint &&
+    enable_self_signed_jwt = @config.endpoint == <%= service.client_name %>.configure.endpoint &&
                              !@config.endpoint.split(".").first.include?("-")
     credentials ||= Credentials.default scope: @config.scope,
                                         enable_self_signed_jwt: enable_self_signed_jwt
@@ -111,12 +116,15 @@ class <%= service.client_name %>
     @quota_project_id = @config.quota_project
     @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
-    <%- if service.lro? -%>
-    <%= service.lro_client_ivar %> = <%= service.operations_name %>.new do |config|
+    <%- if service.subclients? -%>
+    <%- service.subclients.each do |subclient| -%>
+    @<%= subclient.client_var_name %> = <%= subclient.client_class_name %>.new do |config|
       config.credentials = credentials
+      config.quota_project = @quota_project_id
       config.endpoint = @config.endpoint
     end
 
+    <%- end -%>
     <%- end -%>
     @<%= service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.proto_service_stub_name_full %>,
@@ -127,20 +135,22 @@ class <%= service.client_name %>
     )
   end
 
-<%- if service.lro? -%>
+  <%- if service.subclients? -%>
+  <%- service.subclients.each do |subclient| -%>
   ##
-  # Get the associated client for long-running operations.
+  # Get the associated client for <%= subclient.service_description %>.
   #
-  # @return [<%= service.operations_name_full %>]
+  # @return [<%= subclient.client_class_docname %>]
   #
-  attr_reader :<%= service.lro_client_var %>
+  attr_reader :<%= subclient.client_var_name %>
 
-<%- end -%>
+  <%- end -%>
+  <%- end -%>
   # Service calls
   <%- service.methods.each do |method| -%>
 
   <%= indent_tail render(partial: "service/client/method/def", locals: { method: method }), 2 %>
-  <%- end %>
+  <%- end -%>
 
   <%= indent_tail render(partial: "service/client/config", locals: { service: service }), 2 %>
 end

data/templates/default/service/client/_config.erb

@@ -14,22 +14,21 @@
 # on construction.
 #
 <%- unless method_service.methods.empty? -%>
-# # Examples
+# @example
 #
-# To modify the global config, setting the timeout for <%= method_service.methods.first.name %>
-# to 20 seconds, and all remaining timeouts to 10 seconds:
+#   # Modify the global config, setting the timeout for
+#   # <%= method_service.methods.first.name %> to 20 seconds,
+#   # and all remaining timeouts to 10 seconds.
+#   <%= service.client_name_full %>.configure do |config|
+#     config.timeout = 10.0
+#     config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
+#   end
 #
-#     <%= service.client_name_full %>.configure do |config|
-#       config.timeout = 10.0
-#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
-#     end
-#
-# To apply the above configuration only to a new client:
-#
-#     client = <%= service.client_name_full %>.new do |config|
-#       config.timeout = 10.0
-#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
-#     end
+#   # Apply the above configuration only to a new client.
+#   client = <%= service.client_name_full %>.new do |config|
+#     config.timeout = 10.0
+#     config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
+#   end
 #
 <%- end -%>
 # @!attribute [rw] endpoint

data/templates/default/service/client/_nonstandard_lro.erb

@@ -0,0 +1,57 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+require "gapic/operation/retry_policy"
+require "gapic/generic_lro/operation"
+<% end %>
+
+# A module containing nonstandard lro helpers
+module <%= service.nonstandard_lro_name %> 
+  class << self
+    ##
+    # Creates a Generic LRO operation object that wraps the nonstandard
+    # long-running operation specific to this service.
+    #
+    # @param operation [Object] The long-running operation object that is returned by the initial method call.
+    #
+    # @param client [<%= service.usable_service_presenter.client_name_full %>] The client that handles the polling for the longrunning operation.
+    #
+    # @param request_values [Map<String, String>] The values that are to be copied from the request that
+    #   triggered the longrunning operation, into the request that polls for the longrunning operation.
+    #   The format is `name of the request field -> value`
+    #
+    # @param options [Gapic::CallOptions] call options for this operation
+    #
+    # @return [Gapic::GenericLRO::Operation] 
+    #
+    def create_operation operation:, client:, request_values:, options:
+      Gapic::GenericLRO::Operation.new(operation,
+        client: client,
+        polling_method_name: "<%= service.nonstandard_lro_polling_method_name %>",
+        request_values: request_values,
+        operation_status_field: "<%= service.nonstandard_lro.operation_status_field %>",
+        <%- if service.nonstandard_lro.operation_name_field -%>
+        operation_name_field: "<%= service.nonstandard_lro.operation_name_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_err_code_field -%>
+        operation_err_code_field: "<%= service.nonstandard_lro.operation_err_code_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_err_msg_field -%>
+        operation_err_msg_field: "<%= service.nonstandard_lro.operation_err_msg_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_response_fields.any? -%>
+        operation_copy_fields: {
+          <%- service.nonstandard_lro.operation_response_fields.each_with_index do |(field_from, field_to), i| -%>
+          <%- if i == service.nonstandard_lro.operation_response_fields.length - 1 -%>
+          "<%= field_to %>" => "<%= field_from %>"
+          <%- else -%>
+          "<%= field_to %>" => "<%= field_from %>",
+          <%- end -%>
+          <%- end -%>
+        },
+        <%- else -%>
+        operation_copy_fields: {},
+        <%- end -%>
+        options: options)
+    end
+  end
+end

data/templates/default/service/client/_paths.erb

@@ -1,7 +1,7 @@
 <%- assert_locals service -%>
 # Path helper methods for the <%= service.name %> API.
 module Paths
-<%- service.references.each do |resource| -%>
+<%- service.deduped_references.each do |resource| -%>
 <%= indent render(partial: "service/client/resource", locals: { resource: resource }), 2 %>
 
 <%- end %>

data/templates/default/service/client/_self_configure_defaults.erb

@@ -6,7 +6,7 @@
     default_config.timeout = <%= format_number service.grpc_service_config.timeout_seconds %>
   <%- end -%>
   <%- if service.grpc_service_config.retry_policy -%>
-    default_config.retry_policy = <%= indent_tail service.service_config_presenter.retry_policy_fields, 2 %>
+    default_config.retry_policy = <%= indent_tail service.grpc_service_config_presenter.retry_policy_fields, 2 %>
   <%- end -%>
 <%- end -%>
 <%- method_service.methods.each do |method| -%>
@@ -16,7 +16,7 @@
       default_config.rpcs.<%= method.name %>.timeout = <%= format_number method.grpc_service_config.timeout_seconds %>
     <%- end -%>
     <%- if method.grpc_service_config.retry_policy -%>
-      default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail method.service_config_presenter.retry_policy_fields, 2 %>
+      default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail method.grpc_service_config_presenter.retry_policy_fields, 2 %>
     <%- end -%>
   <%- end -%>
 <%- end -%>

data/templates/default/service/client/method/_def.erb

@@ -4,12 +4,14 @@
 <%= indent method.doc_description, "# " %>
 #
 <%- end -%>
+<%= render partial: "service/client/method/docs/deprecated", locals: { method: method } -%>
 <%= render partial: "service/client/method/docs/request", locals: { method: method } -%>
 #
 <%= render partial: "service/client/method/docs/response", locals: { method: method } -%>
 #
 <%= render partial: "service/client/method/docs/error", locals: { method: method } -%>
 #
+<%= render partial: "service/client/method/docs/snippets", locals: { method: method } -%>
 <%= render partial: "service/client/method/docs/samples", locals: { method: method } -%>
 def <%= method.name %> request, options = nil
 <%= indent render(partial: "service/client/method/def/request", locals: { method: method }), 2 %>

data/templates/default/service/client/method/def/_options_defaults.erb

@@ -12,18 +12,13 @@ metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
 metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 <%- if method.routing_params? && !method.client_streaming? -%>
 
-header_params = {
-<%- method.routing_params.each_with_index do |routing_param, index| -%>
-  <%- comma = index == method.routing_params.count - 1 ? "" : "," -%>
-  "<%= routing_param %>" => request.<%= routing_param %><%= comma %>
-<%- end -%>
-}
-request_params_header = header_params.map { |k, v| "#{k}=#{v}" }.join("&")
-metadata[:"x-goog-request-params"] ||= request_params_header
+<%= render partial: "service/client/method/def/routing_params", locals: { method: method } -%>
 <%- end -%>
 
 options.apply_defaults timeout:      @config.rpcs.<%= method.name %>.timeout,
                        metadata:     metadata,
                        retry_policy: @config.rpcs.<%= method.name %>.retry_policy
-options.apply_defaults metadata:     @config.metadata,
+                       
+options.apply_defaults timeout:      @config.timeout,
+                       metadata:     @config.metadata,
                        retry_policy: @config.retry_policy

data/templates/default/service/client/method/def/_response.erb

@@ -1,6 +1,8 @@
 <%- assert_locals method -%>
 <%- if method.paged? -%>
 <%= render partial: "service/client/method/def/response_paged", locals: { method: method } -%>
+<%- elsif method.rest.nonstandard_lro? -%>
+<%= render partial: "service/client/method/def/response_nonstandard_lro", locals: { method: method } -%>
 <%- else -%>
 <%= render partial: "service/client/method/def/response_normal", locals: { method: method } -%>
 <%- end -%>

data/templates/default/service/client/method/def/_response_nonstandard_lro.erb

@@ -0,0 +1,23 @@
+<%- assert_locals method -%>
+@<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |result, response|
+  result = <%= method.nonstandard_lro_client.helper_type %>.create_operation(
+    operation: result,
+    client: <%= method.nonstandard_lro_client.client_var_name %>,
+    <%- if method.lro.operation_request_fields.any? -%>
+    request_values: {
+      <%- method.lro.operation_request_fields.each_with_index do |(field_from, field_to), i| -%>
+      <%- if i == method.lro.operation_request_fields.length - 1 -%>
+      "<%= field_to %>" => request.<%= field_from %>
+      <%- else -%>
+      "<%= field_to %>" => request.<%= field_from %>,
+      <%- end -%>
+      <%- end -%>
+    },
+    <%- else -%>
+    request_values: {},
+    <%- end -%>
+    options: options
+  )
+  yield result, response if block_given?
+  return result
+end

data/templates/default/service/client/method/def/_routing_params.erb

@@ -0,0 +1,36 @@
+<%- assert_locals method -%>
+header_params = {}
+<%- if method.routing.explicit_params? -%>
+<%- method.routing.explicit_params.each do |key_name, routing_infos| -%>
+<%- routing_infos.each do |routing_info| -%>
+<%- if routing_info.pattern_matching_not_needed? -%>
+if request.<%= routing_info.field.gsub(".", "&.") %> && !request.<%= routing_info.field %>.empty?
+  header_params["<%= key_name %>"] = request.<%= routing_info.field %>
+end
+<%- elsif routing_info.value_is_full_field? -%>
+if request.<%= routing_info.field.gsub(".", "&.") %> &&
+  %r{<%= routing_info.field_regex_str %>}.match?(request.<%= routing_info.field %>)
+  header_params["<%= key_name %>"] = request.<%= routing_info.field %> 
+end
+<%- else -%>
+if request.<%= routing_info.field.gsub(".", "&.") %>
+  regex_match = %r{<%= routing_info.field_full_regex_str %>}.match request.<%= routing_info.field %>
+  if regex_match
+    header_params["<%= key_name %>"] = regex_match["<%= key_name %>".to_s] 
+  end
+end
+<%- end -%>
+<%- end -%>
+<%- end -%>
+
+request_params_header = URI.encode_www_form header_params
+<%- else -%>
+<%- method.routing_params.each_with_index do |routing_param, index| -%>
+if request.<%= routing_param.gsub(".", "&.") %>
+  header_params["<%= routing_param %>"] = request.<%= routing_param %>
+end
+<%- end -%>
+
+request_params_header = header_params.map { |k, v| "#{k}=#{v}" }.join("&")
+<%- end -%>
+metadata[:"x-goog-request-params"] ||= request_params_header

data/templates/default/service/client/method/docs/_deprecated.erb

@@ -0,0 +1,5 @@
+<%- assert_locals method -%>
+<%- if method.is_deprecated? -%>
+# @deprecated This method is deprecated and may be removed in the next major version update.
+#
+<%- end -%>

data/templates/default/service/client/method/docs/_snippets.erb

@@ -0,0 +1,6 @@
+<%- assert_locals method -%>
+<%- if method.generate_yardoc_snippets? -%>
+# @example Basic example
+<%= indent render(partial: "snippets/snippet/structure", locals: { snippet: method.snippet }), "#   " %>
+#
+<%- end -%>

data/templates/default/service/nonstandard_lro.erb

@@ -0,0 +1,6 @@
+<%- assert_locals service -%>
+<%= render partial: "service/client/nonstandard_lro",
+           layout: "layouts/ruby",
+           locals: { service: service,
+                     namespace: service.methods_rest_bindings? ? service.rest.service_name_full : service.service_name_full }
+%>

data/templates/default/service/rest/client/_client.erb

@@ -1,7 +1,15 @@
 <%- assert_locals service -%>
 <% @requires = capture do %>
-  <%= render partial: "service/client/requires", locals: { service: service} -%>
-  require "<%= service.proto_service_require %>"
+<%= render partial: "service/client/requires", locals: { service: service} -%>
+require "<%= service.proto_service_require %>"
+require "<%= service.rest.service_stub_require %>"
+<%- if service.subclients? -%>
+<%- service.subclients.each do |subclient| -%>
+<%- unless subclient.client_class_name == "Operations" -%>
+require "<%= subclient.require_str %>"
+<%- end -%>
+<%- end -%>
+<%- end -%>
 <% end %>
 ##
 # REST client for the <%= service.name %> service.
@@ -11,11 +19,10 @@
 #
 <%- end -%>
 class <%= service.rest.client_name %>
-  include <%= service.rest.transcoding_helper_name %>
 <%- if service.paths? -%>
   include <%= service.paths_name %>
-<%- end -%>
 
+<%- end -%>
   # @private
   attr_reader :<%= service.stub_name %>
 
@@ -25,13 +32,12 @@ class <%= service.rest.client_name %>
   # See {<%= service.rest.client_name_full %>::Configuration}
   # for a description of the configuration fields.
   #
-  # ## Example
+  # @example
   #
-  # To modify the configuration for all <%= service.name %> clients:
-  #
-  #     <%= service.rest.client_name_full %>.configure do |config|
-  #       config.timeout = 10.0
-  #     end
+  #   # Modify the configuration for all <%= service.name %> clients
+  #   <%= service.rest.client_name_full %>.configure do |config|
+  #     config.timeout = 10.0
+  #   end
   #
   # @yield [config] Configure the <%= service.rest.client_name %> client.
   # @yieldparam config [<%= service.rest.client_name %>::Configuration]
@@ -65,28 +71,20 @@ class <%= service.rest.client_name %>
   ##
   # Create a new <%= service.name %> REST client object.
   #
-  # ## Examples
-  #
-  # To create a new <%= service.name %> REST client with the default
-  # configuration:
+  # @example
   #
-  #     client = <%= service.rest.client_name_full %>.new
+  #   # Create a client using the default configuration
+  #   client = <%= service.rest.client_name_full %>.new
   #
-  # To create a new <%= service.name %> REST client with a custom
-  # configuration:
-  #
-  #     client = <%= service.rest.client_name_full %>.new do |config|
-  #       config.timeout = 10.0
-  #     end
+  #   # Create a client using a custom configuration
+  #   client = <%= service.rest.client_name_full %>.new do |config|
+  #     config.timeout = 10.0
+  #   end
   #
   # @yield [config] Configure the <%= service.name %> client.
   # @yieldparam config [<%= service.rest.client_name %>::Configuration]
   #
   def initialize
-    # These require statements are intentionally placed here to initialize
-    # the REST modules only when it's required.
-    require "gapic/rest"
-
     # Create the configuration object
     @config = Configuration.new <%= service.rest.client_name %>.configure
 
@@ -102,14 +100,34 @@ class <%= service.rest.client_name %>
     end
     <%- end -%>
     
-    @client_stub = ::Gapic::Rest::ClientStub.new endpoint: @config.endpoint, credentials: credentials
+    <%- if service.subclients? -%>
+    <%- service.subclients.each do |subclient| -%>
+    @<%= subclient.client_var_name %> = <%= subclient.client_class_name %>.new do |config|
+      config.credentials = credentials
+      config.endpoint = @config.endpoint
+    end
+
+    <%- end -%>
+    <%- end -%>
+    @<%= service.stub_name %> = <%= service.rest.service_stub_name_full %>.new endpoint: @config.endpoint, credentials: credentials
   end
 
+  <%- if service.subclients? -%>
+  <%- service.subclients.each do |subclient| -%>
+  ##
+  # Get the associated client for <%= subclient.service_description %>.
+  #
+  # @return [<%= subclient.client_class_docname %>]
+  #
+  attr_reader :<%= subclient.client_var_name %>
+
+  <%- end -%>
+  <%- end -%>
   # Service calls
   <%- service.methods.each do |method| -%>
 
   <%= indent_tail render(partial: "service/rest/client/method/def", locals: { method: method }), 2 %>
-  <%- end %>
+  <%- end -%>
 
   <%= indent_tail render(partial: "service/rest/client/config", locals: { service: service }), 2 %>
 end

data/templates/default/service/rest/client/_config.erb

@@ -51,6 +51,9 @@
 # @!attribute [rw] timeout
 #   The call timeout in seconds.
 #   @return [::Numeric]
+# @!attribute [rw] metadata
+#   Additional REST headers to be sent with the call.
+#   @return [::Hash{::Symbol=>::String}]
 #
 class Configuration
   extend ::Gapic::Config
@@ -64,6 +67,7 @@ class Configuration
   config_attr :lib_name,      nil, ::String, nil
   config_attr :lib_version,   nil, ::String, nil
   config_attr :timeout,       nil, ::Numeric, nil
+  config_attr :metadata,      nil, ::Hash, nil
 
   # @private
   def initialize parent_config = nil
@@ -71,4 +75,48 @@ class Configuration
 
     yield self if block_given?
   end
+
+  ##
+  # Configurations for individual RPCs
+  # @return [Rpcs]
+  #
+  def rpcs
+    @rpcs ||= begin
+      parent_rpcs = nil
+      parent_rpcs = @parent_config.rpcs if defined?(@parent_config) && @parent_config.respond_to?(:rpcs)
+      Rpcs.new parent_rpcs
+    end
+  end
+
+  ##
+  # Configuration RPC class for the <%= service.name %> API.
+  #
+  # Includes fields providing the configuration for each RPC in this service.
+  # Each configuration object is of type `Gapic::Config::Method` and includes
+  # the following configuration fields:
+  #
+  #  *  `timeout` (*type:* `Numeric`) - The call timeout in seconds
+  #
+  # there is one other field (`retry_policy`) that can be set
+  # but is currently not supported for REST Gapic libraries.
+  # 
+  class Rpcs
+  <%- method_service.methods.each do |method| -%>
+    ##
+    # RPC-specific configuration for `<%= method.name %>`
+    # @return [::Gapic::Config::Method]
+    #
+    attr_reader :<%= method.name %>
+  <%- end -%>
+
+    # @private
+    def initialize parent_rpcs = nil
+      <%- method_service.methods.each do |method| -%>
+      <%= method.name %>_config = parent_rpcs.<%= method.name %> if parent_rpcs.respond_to? :<%= method.name %>
+      @<%= method.name %> = ::Gapic::Config::Method.new <%= method.name %>_config
+      <%- end -%>
+
+      yield self if block_given?
+    end
+  end
 end

data/templates/default/service/rest/client/method/_def.erb

@@ -13,6 +13,6 @@ def <%= method.name %> request, options = nil
 
 <%= indent render(partial: "service/rest/client/method/def/options_defaults", locals: { method: method }), 2 %>
 
-<%= indent render(partial: "service/rest/client/method/def/response_normal", locals: { method: method }), 2 %>
+<%= indent render(partial: "service/rest/client/method/def/response", locals: { method: method }), 2 %>
 <%= render partial: "service/rest/client/method/def/rescue", locals: { method: method } -%>
 end

data/templates/default/service/rest/client/method/def/_options_defaults.erb

@@ -3,7 +3,7 @@
 options = ::Gapic::CallOptions.new(**options.to_h) if options.respond_to? :to_h
 
 # Customize the options with defaults
-call_metadata = {}
+call_metadata = @config.rpcs.<%= method.name %>.metadata.to_h
 
 # Set x-goog-api-client header
 call_metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
@@ -11,5 +11,8 @@ call_metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
   gapic_version: ::<%= method.service.gem.version_name_full %>,
   transports_version_send: [:rest]
 
-options.apply_defaults timeout:      @config.timeout,
+options.apply_defaults timeout:      @config.rpcs.<%= method.name %>.timeout,
                        metadata:     call_metadata
+
+options.apply_defaults timeout:      @config.timeout,
+                       metadata:     @config.metadata

data/templates/default/service/rest/client/method/def/_response.erb

@@ -0,0 +1,8 @@
+<%- assert_locals method -%>
+<%- if method.rest.paged? -%>
+<%= render partial: "service/rest/client/method/def/response_paged", locals: { method: method } -%>
+<%- elsif method.rest.nonstandard_lro? -%>
+<%= render partial: "service/rest/client/method/def/response_nonstandard_lro", locals: { method: method } -%>
+<%- else -%>
+<%= render partial: "service/rest/client/method/def/response_normal", locals: { method: method } -%>
+<%- end -%>

data/templates/default/service/rest/client/method/def/_response_nonstandard_lro.erb

@@ -0,0 +1,23 @@
+<%- assert_locals method -%>
+@<%= method.service.stub_name %>.<%= method.name %> request, options do |result, response|
+  result = <%= method.nonstandard_lro_client.helper_type %>.create_operation(
+    operation: result,
+    client: <%= method.nonstandard_lro_client.client_var_name %>,
+    <%- if method.lro.operation_request_fields.any? -%>
+    request_values: {
+      <%- method.lro.operation_request_fields.each_with_index do |(field_from, field_to), i| -%>
+      <%- if i == method.lro.operation_request_fields.length - 1 -%>
+      "<%= field_to %>" => request.<%= field_from %>
+      <%- else -%>
+      "<%= field_to %>" => request.<%= field_from %>,
+      <%- end -%>
+      <%- end -%>
+    },
+    <%- else -%>
+    request_values: {},
+    <%- end -%>
+    options: options
+  )
+  yield result, response if block_given?
+  return result
+end

data/templates/default/service/rest/client/method/def/_response_normal.erb

@@ -1,17 +1,6 @@
 <%- assert_locals method -%>
 
-uri, <%= method.rest.body_var_name %>, <%= method.rest.query_string_params_var_name %> = <%= method.rest.transcoding_helper_name %> request
-response = @client_stub.make_<%= method.rest.verb %>_request(
-  uri:     uri,
-<%- if method.rest.body? -%>
-  body:    body,
-<%- end -%>
-<%- if method.rest.query_string_params? -%>
-  params:  query_string_params,
-<%- end -%>
-  options: options
-)
-result = <%= method.return_type %>.decode_json response.body, ignore_unknown_fields: true
-
-yield result, response if block_given?
-result
+@<%= method.service.stub_name %>.<%= method.name %> request, options do |result, response|
+  yield result, response if block_given?
+  return result
+end