[API] Generator: Use full namespace for Utils only in xpack

Author: picandocodigo

elasticsearch-api/utils/thor/generate_source.rb

@@ -171,7 +171,7 @@ def __http_path
       def __parse_path(path)
         path.gsub(/^\//, '')
             .gsub(/\/$/, '')
-            .gsub('{', '#{Elasticsearch::API::Utils.__listify(_')
+            .gsub('{', "\#{#{__utils}.__listify(_")
             .gsub('}', ')}')
       end
 
@@ -237,6 +237,10 @@ def print_tree
         say_status('tree', lines.first + "\n" + lines[1, lines.size].map { |l| ' ' * 14 + l }.join("\n"))
       end
 
+      def __utils
+        @xpack ? 'Elasticsearch::API::Utils' : 'Utils'
+      end
+
       def run_rubocop
         system("rubocop --format autogenconf -x #{FilesHelper::output_dir(@xpack)}")
       end

elasticsearch-api/utils/thor/templates/_method_setup.erb

@@ -25,7 +25,7 @@
   <%- end -%>
   <%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
   <%- unless @params.empty? -%>
-    <%= '  '*(@namespace_depth+4) %>params = Elasticsearch::API::Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+    <%= '  '*(@namespace_depth+4) %>params = <%= __utils %>.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
   <%- else -%>
     <%= '  '*(@namespace_depth+4) %>params = {}
   <%- end -%>

elasticsearch-api/utils/thor/templates/_perform_request.erb

@@ -10,7 +10,7 @@ when 'mtermvectors'
 <%- when 'cluster.reroute', 'cluster.put_settings' %>
   body = arguments[:body] || {}
 <%- when 'ml.find_file_structure' %>
-  body = Elasticsearch::API::Utils.__bulkify(arguments.delete(:body))
+  body = <%= __utils %>.__bulkify(arguments.delete(:body))
 <%- else -%>
   <%= '  '*(@namespace_depth+3) %>body   = <%= @spec['body'].nil? ? 'nil' : 'arguments[:body]' %>
 <%- end -%>
@@ -21,12 +21,12 @@ when 'mtermvectors'
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
-    Elasticsearch::API::Utils.__rescue_from_not_found do
+    <%= __utils %>.__rescue_from_not_found do
       perform_request(method, path, params, body).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
-      Elasticsearch::API::Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
+      <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body).body }
     else
       perform_request(method, path, params, body).body
     end